diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/l10n/nl.js | 5 | ||||
| -rw-r--r-- | lib/l10n/nl.json | 5 | ||||
| -rw-r--r-- | lib/l10n/sv.js | 1 | ||||
| -rw-r--r-- | lib/l10n/sv.json | 1 | ||||
| -rw-r--r-- | lib/private/Server.php | 3 | ||||
| -rw-r--r-- | lib/public/INavigationManager.php | 21 |
6 files changed, 30 insertions, 6 deletions
diff --git a/lib/l10n/nl.js b/lib/l10n/nl.js index 8b3c26528c6..d1eab7cb4c7 100644 --- a/lib/l10n/nl.js +++ b/lib/l10n/nl.js @@ -1,10 +1,10 @@ OC.L10N.register( "lib", { - "Cannot write into \"config\" directory!" : "Kan niet schrijven naar de \"config\" directory", + "Cannot write into \"config\" directory!" : "Kan niet schrijven naar de \"config\" directory!", "This can usually be fixed by giving the webserver write access to the config directory" : "Dit kan opgelost worden door de config map op de webserver schrijfrechten te geven", "See %s" : "Zie %s", - "Or, if you prefer to keep config.php file read only, set the option \"config_is_read_only\" to true in it." : "Of, als je liever config.php allees-lezen witl houden, stel de optie \"config_is_read_only\" in op true.", + "Or, if you prefer to keep config.php file read only, set the option \"config_is_read_only\" to true in it." : "Of, als je liever config.php alleen-lezen wilt houden, stel de optie \"config_is_read_only\" in op true.", "This can usually be fixed by giving the webserver write access to the config directory. See %s" : "Dit kan opgelost worden door de config map op de webserver schrijf rechten te geven. See %s", "Or, if you prefer to keep config.php file read only, set the option \"config_is_read_only\" to true in it. See %s" : "Of, als je liever config.php Alleen-lezen houdt, stel de optie \"config_is_read_only\" in op true. Zie %s", "The files of the app %$1s were not replaced correctly. Make sure it is a version compatible with the server." : "De bestanden van de app %$1s zijn niet correct vervangen. Zorg ervoor dat de app versie compatibel is met de server.", @@ -76,6 +76,7 @@ OC.L10N.register( "Basic settings" : "Basis-instellingen", "Sharing" : "Delen", "Security" : "Beveiliging", + "Theming" : "Stijlen", "Groupware" : "Groupware", "Additional settings" : "Aanvullende instellingen", "Personal info" : "Persoonlijke informatie", diff --git a/lib/l10n/nl.json b/lib/l10n/nl.json index b1fc54b2681..e129f9339c3 100644 --- a/lib/l10n/nl.json +++ b/lib/l10n/nl.json @@ -1,8 +1,8 @@ { "translations": { - "Cannot write into \"config\" directory!" : "Kan niet schrijven naar de \"config\" directory", + "Cannot write into \"config\" directory!" : "Kan niet schrijven naar de \"config\" directory!", "This can usually be fixed by giving the webserver write access to the config directory" : "Dit kan opgelost worden door de config map op de webserver schrijfrechten te geven", "See %s" : "Zie %s", - "Or, if you prefer to keep config.php file read only, set the option \"config_is_read_only\" to true in it." : "Of, als je liever config.php allees-lezen witl houden, stel de optie \"config_is_read_only\" in op true.", + "Or, if you prefer to keep config.php file read only, set the option \"config_is_read_only\" to true in it." : "Of, als je liever config.php alleen-lezen wilt houden, stel de optie \"config_is_read_only\" in op true.", "This can usually be fixed by giving the webserver write access to the config directory. See %s" : "Dit kan opgelost worden door de config map op de webserver schrijf rechten te geven. See %s", "Or, if you prefer to keep config.php file read only, set the option \"config_is_read_only\" to true in it. See %s" : "Of, als je liever config.php Alleen-lezen houdt, stel de optie \"config_is_read_only\" in op true. Zie %s", "The files of the app %$1s were not replaced correctly. Make sure it is a version compatible with the server." : "De bestanden van de app %$1s zijn niet correct vervangen. Zorg ervoor dat de app versie compatibel is met de server.", @@ -74,6 +74,7 @@ "Basic settings" : "Basis-instellingen", "Sharing" : "Delen", "Security" : "Beveiliging", + "Theming" : "Stijlen", "Groupware" : "Groupware", "Additional settings" : "Aanvullende instellingen", "Personal info" : "Persoonlijke informatie", diff --git a/lib/l10n/sv.js b/lib/l10n/sv.js index d1ddb1025c6..7a18f750918 100644 --- a/lib/l10n/sv.js +++ b/lib/l10n/sv.js @@ -72,6 +72,7 @@ OC.L10N.register( "Basic settings" : "Generella inställningar", "Sharing" : "Delning", "Security" : "Säkerhet", + "Theming" : "Teman", "Groupware" : "Grupprogram", "Additional settings" : "Övriga inställningar", "Personal info" : "Personlig information", diff --git a/lib/l10n/sv.json b/lib/l10n/sv.json index e26ec74917f..2029cf63ad5 100644 --- a/lib/l10n/sv.json +++ b/lib/l10n/sv.json @@ -70,6 +70,7 @@ "Basic settings" : "Generella inställningar", "Sharing" : "Delning", "Security" : "Säkerhet", + "Theming" : "Teman", "Groupware" : "Grupprogram", "Additional settings" : "Övriga inställningar", "Personal info" : "Personlig information", diff --git a/lib/private/Server.php b/lib/private/Server.php index 89f55fcc9f3..8a49a8a8a94 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -964,7 +964,8 @@ class Server extends ServerContainer implements IServerContainer { $c->getMemCacheFactory(), new Util($c->getConfig(), $this->getAppManager(), $c->getAppDataDir('theming')), new ImageManager($c->getConfig(), $c->getAppDataDir('theming'), $c->getURLGenerator(), $this->getMemCacheFactory(), $this->getLogger()), - $c->getAppManager() + $c->getAppManager(), + $c->getNavigationManager() ); } return new \OC_Defaults(); diff --git a/lib/public/INavigationManager.php b/lib/public/INavigationManager.php index 77b881b8b15..f840bc8c8a5 100644 --- a/lib/public/INavigationManager.php +++ b/lib/public/INavigationManager.php @@ -39,6 +39,25 @@ namespace OCP; * @since 6.0.0 */ interface INavigationManager { + + /** + * Navigation entries of the app navigation + * @since 16.0.0 + */ + const TYPE_APPS = 'link'; + + /** + * Navigation entries of the settings navigation + * @since 16.0.0 + */ + const TYPE_SETTINGS = 'settings'; + + /** + * Navigation entries for public page footer navigation + * @since 16.0.0 + */ + const TYPE_GUEST = 'guest'; + /** * Creates a new navigation entry * @@ -65,5 +84,5 @@ interface INavigationManager { * @return array * @since 14.0.0 */ - public function getAll(string $type = 'link'): array; + public function getAll(string $type = self::TYPE_APPS): array; } |