mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1117 from iamfool/master 

Update Admin.php
This commit is contained in:
Lukas Reschke 2016-08-29 15:27:41 +02:00 committed by GitHub
parent 3647fbe7cd 7e1a690059
commit 4005e58f93
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/theming/lib/Settings/Admin.php
View File

@ -61,7 +61,7 @@ class Admin implements ISettings {
$theme = $this->config->getSystemValue('theme', ''); $theme = $this->config->getSystemValue('theme', '');
if ($theme !== '') { if ($theme !== '') {
$themable = false; $themable = false;
$errorMessage = $this->l->t('You already use a custom theme'); $errorMessage = $this->l->t('You are already using a custom theme');
} }
$parameters = [ $parameters = [

6
apps/theming/tests/Settings/AdminTest.php
View File

@ -112,8 +112,8 @@ class AdminTest extends TestCase {
$this->l10n $this->l10n
->expects($this->once()) ->expects($this->once())
->method('t') ->method('t')
->with('You already use a custom theme') ->with('You are already using a custom theme')
->willReturn('You already use a custom theme'); ->willReturn('You are already using a custom theme');
$this->themingDefaults $this->themingDefaults
->expects($this->once()) ->expects($this->once())
->method('getEntity') ->method('getEntity')
@ -137,7 +137,7 @@ class AdminTest extends TestCase {
->willReturn('/my/route'); ->willReturn('/my/route');
$params = [ $params = [
'themable' => false, 'themable' => false,
'errorMessage' => 'You already use a custom theme', 'errorMessage' => 'You are already using a custom theme',
'name' => 'MyEntity', 'name' => 'MyEntity',
'url' => 'https://example.com', 'url' => 'https://example.com',
'slogan' => 'MySlogan', 'slogan' => 'MySlogan',