Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulius Härtl <jus@bitgrid.net>2018-03-26 19:20:18 +0300
committerJulius Härtl <jus@bitgrid.net>2018-03-26 19:23:51 +0300
commitb6501ae966582047a65b22b93f45c5bab049426d (patch)
tree93e986f1d9c550ff39ce0bb9d3517401592339c4 /apps/theming/tests
parente2b44d199bea7da74811689ec3ab787135e22de6 (diff)
Show UI when using a custom theme
Do not hide the theming app UI when using a custom theme besides it, but warn the users about some settings being overwritten by that. Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'apps/theming/tests')
-rw-r--r--apps/theming/tests/Settings/AdminTest.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/theming/tests/Settings/AdminTest.php b/apps/theming/tests/Settings/AdminTest.php
index bb68651d143..ee49cf0f1f6 100644
--- a/apps/theming/tests/Settings/AdminTest.php
+++ b/apps/theming/tests/Settings/AdminTest.php
@@ -118,8 +118,8 @@ class AdminTest extends TestCase {
$this->l10n
->expects($this->once())
->method('t')
- ->with('You are already using a custom theme')
- ->willReturn('You are already using a custom theme');
+ ->with('You are already using a custom theme. Theming app settings might be overwritten by that.')
+ ->willReturn('You are already using a custom theme. Theming app settings might be overwritten by that.');
$this->themingDefaults
->expects($this->once())
->method('getEntity')
@@ -143,7 +143,7 @@ class AdminTest extends TestCase {
->willReturn('/my/route');
$params = [
'themable' => false,
- 'errorMessage' => 'You are already using a custom theme',
+ 'errorMessage' => 'You are already using a custom theme. Theming app settings might be overwritten by that.',
'name' => 'MyEntity',
'url' => 'https://example.com',
'slogan' => 'MySlogan',