clones/friendica-addons
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1084 from urbalazs/js_upload-20210323 

[js_upload] Improve wording with placeholders
This commit is contained in:
Hypolite Petovan 2021-03-22 22:17:53 -04:00 committed by GitHub
parent e119866de7 73e780d7b6
commit 468be1978b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js_upload/js_upload.php
View File

@ -12,6 +12,7 @@ use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\DI; use Friendica\DI;
use Friendica\Util\Strings;
function js_upload_install() function js_upload_install()
{ {
@ -229,8 +230,7 @@ class qqFileUploader
$maximagesize = DI::config()->get('system', 'maximagesize'); $maximagesize = DI::config()->get('system', 'maximagesize');
if (($maximagesize) && ($size > $maximagesize)) { if (($maximagesize) && ($size > $maximagesize)) {
return ['error' => DI::l10n()->t('Image exceeds size limit of ') . $maximagesize]; return ['error' => DI::l10n()->t('Image exceeds size limit of %s', Strings::formatBytes($maximagesize))];
} }
$pathinfo = pathinfo($this->file->getName()); $pathinfo = pathinfo($this->file->getName());
@ -242,8 +242,7 @@ class qqFileUploader
$ext = $pathinfo['extension'] ?? ''; $ext = $pathinfo['extension'] ?? '';
if ($this->allowedExtensions && !in_array(strtolower($ext), $this->allowedExtensions)) { if ($this->allowedExtensions && !in_array(strtolower($ext), $this->allowedExtensions)) {
$these = implode(', ', $this->allowedExtensions); return ['error' => DI::l10n()->t('File has an invalid extension, it should be one of %s.', implode(', ', $this->allowedExtensions))];
return ['error' => DI::l10n()->t('File has an invalid extension, it should be one of ') . $these . '.'];
} }
if ($this->file->save()) { if ($this->file->save()) {