sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9585 from nextcloud/feature/noid/rename-syncclients 

Rename sync clients section to mobile & desktop
pull/7736/merge
Morris Jobke 2018-05-26 11:18:47 +07:00 committed by GitHub
parent f0fdac8078 441cedf1df
commit a27e2bfcfd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/Settings/Manager.php
Unescape Escape View File

@ -350,7 +350,7 @@ class Manager implements IManager {
$sections = [
0 => [new Section('personal-info', $this->l->t('Personal info'), 0, $this->url->imagePath('core', 'actions/info.svg'))],
5 => [new Section('security', $this->l->t('Security'), 0, $this->url->imagePath('settings', 'password.svg'))],
15 => [new Section('sync-clients', $this->l->t('Sync clients'), 0, $this->url->imagePath('settings', 'change.svg'))],
15 => [new Section('sync-clients', $this->l->t('Mobile & desktop'), 0, $this->url->imagePath('core', 'clients/phone.svg'))],
];
$legacyForms = \OC_App::getForms('personal');

8
tests/lib/Settings/ManagerTest.php
Unescape Escape View File

@ -150,13 +150,13 @@ class ManagerTest extends TestCase {
->willReturnMap([
['core', 'actions/info.svg', '1'],
['settings', 'password.svg', '2'],
['settings', 'change.svg', '3'],
['core', 'clients/phone.svg', '3'],
]);
$this->assertEquals([
0 => [new Section('personal-info', 'Personal info', 0, '1')],
5 => [new Section('security', 'Security', 0, '2')],
15 => [new Section('sync-clients', 'Sync clients', 0, '3')],
15 => [new Section('sync-clients', 'Mobile & desktop', 0, '3')],
55 => [\OC::$server->query(\OCA\WorkflowEngine\Settings\Section::class)],
], $this->manager->getPersonalSections());
}
@ -199,13 +199,13 @@ class ManagerTest extends TestCase {
->willReturnMap([
['core', 'actions/info.svg', '1'],
['settings', 'password.svg', '2'],
['settings', 'change.svg', '3'],
['core', 'clients/phone.svg', '3'],
]);
$this->assertArraySubset([
0 => [new Section('personal-info', 'Personal info', 0, '1')],
5 => [new Section('security', 'Security', 0, '2')],
15 => [new Section('sync-clients', 'Sync clients', 0, '3')],
15 => [new Section('sync-clients', 'Mobile & desktop', 0, '3')],
], $this->manager->getPersonalSections());
}