diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2018-03-20 13:45:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-20 13:45:20 +0100 |
| commit | 64feb3f3912f0976bb028f5d56a6434c55085925 (patch) | |
| tree | b5d2aa9a188b8e2ec126492615e712c60cfa715a /apps | |
| parent | 99abe3bc8e853a4b7ea9577b6cc15531a84bfe3e (diff) | |
| parent | 789221a0fcef435ae95b6aec22382b6757dd0469 (diff) | |
| download | nextcloud-server-64feb3f3912f0976bb028f5d56a6434c55085925.tar.gz nextcloud-server-64feb3f3912f0976bb028f5d56a6434c55085925.zip | |
Merge pull request #8861 from nextcloud/rakekniven-patch-1
Update ThemingController.php
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/theming/lib/Controller/ThemingController.php | 6 | ||||
| -rw-r--r-- | apps/theming/tests/Controller/ThemingControllerTest.php | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/apps/theming/lib/Controller/ThemingController.php b/apps/theming/lib/Controller/ThemingController.php index 74f6a6f036d..47f806d16f9 100644 --- a/apps/theming/lib/Controller/ThemingController.php +++ b/apps/theming/lib/Controller/ThemingController.php @@ -218,14 +218,14 @@ class ThemingController extends Controller { $newBackgroundLogo = $this->request->getUploadedFile('upload-login-background'); $error = null; $phpFileUploadErrors = [ - UPLOAD_ERR_OK => $this->l10n->t('There is no error, the file uploaded with success'), + UPLOAD_ERR_OK => $this->l10n->t('The file was uploaded'), UPLOAD_ERR_INI_SIZE => $this->l10n->t('The uploaded file exceeds the upload_max_filesize directive in php.ini'), UPLOAD_ERR_FORM_SIZE => $this->l10n->t('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form'), UPLOAD_ERR_PARTIAL => $this->l10n->t('The file was only partially uploaded'), UPLOAD_ERR_NO_FILE => $this->l10n->t('No file was uploaded'), UPLOAD_ERR_NO_TMP_DIR => $this->l10n->t('Missing a temporary folder'), - UPLOAD_ERR_CANT_WRITE => $this->l10n->t('Failed to write file to disk.'), - UPLOAD_ERR_EXTENSION => $this->l10n->t('A PHP extension stopped the file upload.'), + UPLOAD_ERR_CANT_WRITE => $this->l10n->t('Could not write file to disk'), + UPLOAD_ERR_EXTENSION => $this->l10n->t('A PHP extension stopped the file upload'), ]; if (empty($newLogo) && empty($newBackgroundLogo)) { $error = $this->l10n->t('No file uploaded'); diff --git a/apps/theming/tests/Controller/ThemingControllerTest.php b/apps/theming/tests/Controller/ThemingControllerTest.php index 25c5686dda1..08af13f994b 100644 --- a/apps/theming/tests/Controller/ThemingControllerTest.php +++ b/apps/theming/tests/Controller/ThemingControllerTest.php @@ -529,8 +529,8 @@ class ThemingControllerTest extends TestCase { [UPLOAD_ERR_PARTIAL, 'The file was only partially uploaded'], [UPLOAD_ERR_NO_FILE, 'No file was uploaded'], [UPLOAD_ERR_NO_TMP_DIR, 'Missing a temporary folder'], - [UPLOAD_ERR_CANT_WRITE, 'Failed to write file to disk.'], - [UPLOAD_ERR_EXTENSION, 'A PHP extension stopped the file upload.'], + [UPLOAD_ERR_CANT_WRITE, 'Could not write file to disk'], + [UPLOAD_ERR_EXTENSION, 'A PHP extension stopped the file upload'], ]; } |