diff options
author | Lukas Reschke <lukas@statuscode.ch> | 2016-08-29 15:27:41 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-29 15:27:41 +0200 |
commit | 4005e58f93a2e43d025f2ce7b4d31972056ba025 (patch) | |
tree | 25018b0cce197ceac7938696505e411d424c366d /apps | |
parent | 3647fbe7cd86e743b059889d69b03fcf8207780f (diff) | |
parent | 7e1a69005909a425e7e1dd92a0a2b12b5049f35b (diff) | |
download | nextcloud-server-4005e58f93a2e43d025f2ce7b4d31972056ba025.tar.gz nextcloud-server-4005e58f93a2e43d025f2ce7b4d31972056ba025.zip |
Merge pull request #1117 from iamfool/master
Update Admin.php
Diffstat (limited to 'apps')
-rw-r--r-- | apps/theming/lib/Settings/Admin.php | 2 | ||||
-rw-r--r-- | apps/theming/tests/Settings/AdminTest.php | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/theming/lib/Settings/Admin.php b/apps/theming/lib/Settings/Admin.php index afd74ced217..22ab5650e5b 100644 --- a/apps/theming/lib/Settings/Admin.php +++ b/apps/theming/lib/Settings/Admin.php @@ -61,7 +61,7 @@ class Admin implements ISettings { $theme = $this->config->getSystemValue('theme', ''); if ($theme !== '') { $themable = false; - $errorMessage = $this->l->t('You already use a custom theme'); + $errorMessage = $this->l->t('You are already using a custom theme'); } $parameters = [ diff --git a/apps/theming/tests/Settings/AdminTest.php b/apps/theming/tests/Settings/AdminTest.php index 73339cf86b7..d4f5490d352 100644 --- a/apps/theming/tests/Settings/AdminTest.php +++ b/apps/theming/tests/Settings/AdminTest.php @@ -112,8 +112,8 @@ class AdminTest extends TestCase { $this->l10n ->expects($this->once()) ->method('t') - ->with('You already use a custom theme') - ->willReturn('You already use a custom theme'); + ->with('You are already using a custom theme') + ->willReturn('You are already using a custom theme'); $this->themingDefaults ->expects($this->once()) ->method('getEntity') @@ -137,7 +137,7 @@ class AdminTest extends TestCase { ->willReturn('/my/route'); $params = [ 'themable' => false, - 'errorMessage' => 'You already use a custom theme', + 'errorMessage' => 'You are already using a custom theme', 'name' => 'MyEntity', 'url' => 'https://example.com', 'slogan' => 'MySlogan', |