Merge pull request 'release 5.1.1' (#433) from develop into master

Reviewed-on: deblan/side_menu#433

lib/Controller/JsController.php

@@ -20,6 +20,7 @@
 namespace OCA\SideMenu\Controller;
 
 use OC\User\User;
+use OCA\SideMenu\AppInfo\Application;
 use OCA\SideMenu\Service\ConfigProxy;
 use OCA\Theming\ThemingDefaults;
 use OCP\AppFramework\Controller;
@@ -28,12 +29,10 @@ use OCP\AppFramework\Http\Attribute\NoAdminRequired;
 use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
 use OCP\AppFramework\Http\Attribute\PublicPage;
 use OCP\AppFramework\Http\JSONResponse;
+use OCP\AppFramework\Http\TemplateResponse;
 use OCP\IRequest;
 use OCP\IUserSession;
 use OCP\L10N\IFactory;
-use OCP\IAvatarManager;
-use OCP\INavigationManager;
-use OCP\IURLGenerator;
 
 class JsController extends Controller
 {
@@ -45,13 +44,14 @@ class JsController extends Controller
         protected ConfigProxy $config,
         protected ThemingDefaults $themingDefaults,
         protected IFactory $l10nFactory,
-        protected IAvatarManager $avatarManager,
-        protected IUserSession $userSession,
-        protected INavigationManager $navigationManager,
-        protected IURLGenerator $urlGenerator,
     ) {
         parent::__construct($appName, $request);
-        $this->user = $this->userSession->getUser();
+
+        $this->themingDefaults = $themingDefaults;
+
+        $this->user = \OC::$server[IUserSession::class]->getUser();
+        $this->config = $config;
+        $this->l10nFactory = $l10nFactory;
     }
 
     #[NoCSRFRequired]
@@ -99,25 +99,25 @@ class JsController extends Controller
                 $targetBlankApps = $userTargetBlankApps;
             }
 
-            $isAvatarSet = $this->avatarManager->getAvatar($this->user->getUID())->exists();
+            $isAvatarSet = \OC::$server->getAvatarManager()->getAvatar($this->user->getUid())->exists();
 
             if ($useAvatar && $isAvatarSet) {
-                $avatar = $this->urlGenerator->linkToRoute('core.avatar.getAvatar', [
+                $avatar = \OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', [
-                    'userId' => $this->user->getUID(),
+                    'userId' => $this->user->getUid(),
                     'size' => 128,
                     'v' => $this->config->getUserValueInt($this->user, 'avatar', 'version', 0),
                 ]);
             }
 
             if ($this->config->getAppValueBool('show-settings', '0')) {
-                $settingsNav = $this->navigationManager->getAll('settings');
+                $settingsNav = \OC::$server->getNavigationManager()->getAll('settings');
 
                 if (isset($settingsNav['settings'])) {
                     $settings = [
                         'href' => $settingsNav['settings']['href'],
                         'name' => $settingsNav['settings']['name'],
-                        'avatar' => $this->urlGenerator->linkToRoute('core.avatar.getAvatar', [
+                        'avatar' => \OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', [
-                            'userId' => $this->user->getUID(),
+                            'userId' => $this->user->getUid(),
                             'size' => 32,
                             'v' => $this->config->getUserValueInt($this->user, 'avatar', 'version', 0),
                         ]),
@@ -126,7 +126,7 @@ class JsController extends Controller
             }
         }
 
-        $indexUrl = $this->urlGenerator->linkTo('', 'index.php');
+        $indexUrl = \OC::$server->getURLGenerator()->linkTo('', 'index.php');
 
         return [
             'opener-position' => $this->config->getAppValue('opener-position', 'before'),

src/l10n/fixtures/fr.yaml

@@ -1,20 +1,15 @@
-'Custom menu': '­­­Menu personnalisé'
+'Custom menu': 'Menu personnalisé'
 'Enable the custom menu': 'Activer le menu personnalisé'
 'No': 'Non'
 'Yes': 'Oui'
 'Menu': 'Menu'
-'Use the shortcut Ctrl+o to open and to hide the side menu. Use tab key to navigate.': 'Utiliser
+'Use the shortcut Ctrl+o to open and to hide the side menu. Use tab key to navigate.': 'Utiliser le raccourcis clavier Ctrl+o pour ouvrir et fermer le menu latéral. Utiliser tab key pour naviguer.'
-  le raccourcis clavier Ctrl+o pour ouvrir et fermer le menu latéral. Utiliser tab
-  key pour naviguer.'
 'Top menu': 'Menu supérieur'
-'Apps that not must be moved in the side menu': 'Les applications qui ne doivent pas
+'Apps that not must be moved in the side menu': 'Les applications qui ne doivent pas être affichées dans le menu latéral'
-  être affichées dans le menu latéral'
+'If there is no selection then the global configuration is applied.': "Si il n'y a aucune sélection alors la configuration globale sera appliquée."
-'If there is no selection then the global configuration is applied.': "Si il n'y a
-  aucune sélection alors la configuration globale sera appliquée."
 'Experimental': 'Expérimental'
 'Save': 'Sauvegarder'
-'You like this app and you want to support me?': "Vous aimer cette application et
+'You like this app and you want to support me?': "Vous aimer cette application et vous souhaitez m'aider ?"
-  vous souhaitez m'aider ?"
 'Buy me a coffee ☕': 'Offrez moi un café ☕'
 'Hidden': 'Caché'
 'Small': 'Petit'
@@ -48,22 +43,17 @@
 'Before the logo': 'Avant le logo'
 'After the logo': 'Après le logo'
 'Position': 'Position'
-'Show only the opener (hidden logo)': "Afficher uniquement le bouton d'ouverture (masquer
+'Show only the opener (hidden logo)': "Afficher uniquement le bouton d'ouverture (masquer le logo)"
-  le logo)"
+'Do not display the side menu and the opener if there is no application (eg: public pages).': "Ne pas afficher le menu latéral et le bouton d'ouverture s'il n'y a aucune application (exemple : page publiques)."
-'Do not display the side menu and the opener if there is no application (eg: public pages).': "Ne
-  pas afficher le menu latéral et le bouton d'ouverture s'il n'y a aucune application
-  (exemple : page publiques)."
 'Panel': 'Panneau'
-'Open the menu when the mouse is hover the opener (automatically disabled on touch screens)': 'Ouvrir
+'Open the menu when the mouse is hover the opener (automatically disabled on touch screens)': 'Ouvrir le menu au passage de la souris (automatiquement désactivé sur les écrans tactiles)'
-  le menu au passage de la souris (automatiquement désactivé sur les écrans tactiles)'
 'Display the big menu': 'Afficher le menu large'
 'Display the logo': 'Afficher le logo'
 'Icons and texts': 'Icônes et textes'
 'Loader enabled': "Activation de l'indicateur de chargement"
 'Tips': 'Astuces'
 'Always displayed': 'Toujours affiché'
-'This is the automatic behavior when the menu is always displayed.': "C'est le comportement
+'This is the automatic behavior when the menu is always displayed.': "C'est le comportement automatique lorsque le menu est toujours affiché."
-  automatique lorsque le menu est toujours affiché."
 'Not compatible with touch screens.': 'Incompatible avec les écrans tactiles.'
 'Big menu': 'Menu large'
 'Live preview': 'Aperçu en direct'
@@ -72,21 +62,16 @@
 'Use my selection': 'Utiliser ma sélection'
 'Show and hide the list of applications': 'Afficher et masquer la liste des applications'
 'Use the avatar instead of the logo': "Utiliser l'avatar à la place du logo"
-'You do not have permission to change the settings.': "Vous n'avez pas la permission
+'You do not have permission to change the settings.': "Vous n'avez pas la permission de changer les paramètres."
-  de changer les paramètres."
 'Force this configuration to users': 'Forcer cette configuration aux utilisateurs'
 'Export the configuration': 'Exporter la configuration'
 'Purge the cache': 'Purger le cache'
 'Show the link to settings': 'Afficher le lien vers les paramètres'
-'The menu is enabled by default for users': 'Le menu est activé par défaut pour les
+'The menu is enabled by default for users': 'Le menu est activé par défaut pour les utilisateurs'
-  utilisateurs'
 'Except when the configuration is forced.': 'Sauf lorsque la configuration est forcée.'
-'Apps that should not be displayed in the menu': 'Applications qui ne doivent pas
+'Apps that should not be displayed in the menu': 'Applications qui ne doivent pas être affichées dans le menu'
-  être affichées dans le menu'
+'This feature is only compatible with the <code>big menu</code> display.': "Compatible avec l'affichage <code>Menu large</code>."
-'This feature is only compatible with the <code>big menu</code> display.': "Compatible
+'The logo is a link to the default app': "Le logo est un lien vers l'application par défaut"
-  avec l'affichage <code>Menu large</code>."
-'The logo is a link to the default app': "Le logo est un lien vers l'application par
-  défaut"
 'Others': 'Autres'
 'Categories': 'Catégories'
 'Customize sorting': 'Personnaliser le tri'
@@ -94,8 +79,7 @@
 'Name': 'Nom'
 'Customed': 'Personnalisé'
 'Show and hide the list of categories': 'Afficher et masquer la liste des catégories'
-'This parameters are used when Dark theme or Breeze Dark Theme are enabled.': 'Ces
+'This parameters are used when Dark theme or Breeze Dark Theme are enabled.': 'Ces paramètres sont utilisés lorsque le thème sombre ou le thème Breeze Dark sont activés.'
-  paramètres sont utilisés lorsque le thème sombre ou le thème Breeze Dark sont activés.'
 'Dark mode colors': 'Couleurs du mode sombre'
 'With categories': 'Avec les catégories'
 'Custom categories': 'Catégories personnalisées'
@@ -103,12 +87,9 @@
 'Reset to default': 'Restaurer les valeurs par défaut'
 'Applications': 'Applications'
 'Applications kept in the top menu': 'Applications conservées dans le menu supérieur'
-'Applications kept in the top menu but also shown in side menu': 'Applications conservées
+'Applications kept in the top menu but also shown in side menu': 'Applications conservées dans le menu supérieur mais également affichées dans le menu latéral'
-  dans le menu supérieur mais également affichées dans le menu latéral'
+'These applications must be selected in the previous option.': "Ces applications doivent également être sélectionnées dans l'option précédente."
-'These applications must be selected in the previous option.': "Ces applications doivent
+'Hide labels on mouse over': 'Masquer le libellé des applications au passage de la souris'
-  également être sélectionnées dans l'option précédente."
-'Hide labels on mouse over': 'Masquer le libellé des applications au passage de la
-  souris'
 'Except the hovered app': "À l'exception de l'application survolée"
 'Search': 'Rechercher'
 'Toggle the menu': 'Basculer le menu'

src/l10n/fixtures/ru.yaml

@@ -43,8 +43,8 @@
 'Before the logo': 'Перед логотипом'
 'After the logo': 'После логотипа'
 'Position': 'Положение'
-'Show only the opener (hidden logo)': 'Показать только открывающую кнопку (скрытый логотип)'
+'Show only the opener (hidden logo)': 'Показать только открывающую часть (скрытый логотип)'
-'Do not display the side menu and the opener if there is no application (eg: public pages).': 'Не отображать боковое меню и открывалку, если нет доступного приложения (н.п. публичные страницы).'
+'Do not display the side menu and the opener if there is no application (eg: public pages).': 'Не отображать боковое меню и открывалку, если нет приложения (например, публичные страницы).'
 'Panel': 'Панель'
 'Open the menu when the mouse is hover the opener (automatically disabled on touch screens)': 'Открывать меню при наведении мыши на открывалку (автоматически отключается на сенсорных экранах)'
 'Display the big menu': 'Отобразить большое меню'
@@ -63,21 +63,21 @@
 'Show and hide the list of applications': 'Показать или скрыть список приложений'
 'Use the avatar instead of the logo': 'Использовать аватар вместо логотипа'
 'You do not have permission to change the settings.': 'У вас нет разрешения изменять настройки.'
-'Force this configuration to users': 'Для обеспечения соблюдения этих настроек пользователями'
+'Force this configuration to users': 'Принудительно предоставить эту конфигурацию пользователям'
 'Export the configuration': 'Экспортировать конфигурацию'
 'Purge the cache': 'Очистить кэш'
 'Show the link to settings': 'Показать ссылку на настройки'
 'The menu is enabled by default for users': 'Это меню включено по умолчанию для пользователей'
-'Except when the configuration is forced.': 'За исключением случаев, когда настройка принудительная.'
+'Except when the configuration is forced.': 'За исключением случаев, когда конфигурация является принудительной.'
 'Apps that should not be displayed in the menu': 'Ппрограммы, скрытые из меню'
-'This feature is only compatible with the <code>big menu</code> display.': 'Эта возможность совместима только с отображением <code>большого меню</code>.'
+'This feature is only compatible with the <code>big menu</code> display.': 'Эта функция совместима только с отображением <code>большого меню</code>.'
 'The logo is a link to the default app': 'Логотип открывает приложение по умолчанию'
 'Others': 'Прочие'
 'Categories': 'Категории'
 'Customize sorting': 'Настроить сортировку'
 'Order by': 'В порядке'
 'Name': 'Название'
-'Customed': 'Приспособлено'
+'Customed': 'Customed'
 'Show and hide the list of categories': 'Показать или скрыть список категорий'
 'This parameters are used when Dark theme or Breeze Dark Theme are enabled.': 'Эти настройки используются темами Тёмная и Тёмная Breeze.'
 'Dark mode colors': 'Цвета тёмной темы'
@@ -90,22 +90,22 @@
 'Applications kept in the top menu but also shown in side menu': 'Приложения хранящиеся в верхнем меню, но также отображающиеся в боковом меню'
 'These applications must be selected in the previous option.': 'Эти приложения необходимо выбрать в предыдущем выборе.'
 'Hide labels on mouse over': 'Скрыть название при наведении мыши'
-'Except the hovered app': 'Кроме приложения на котором сейчас'
+'Except the hovered app': 'Кроме приложения, на котором курсор'
 'Search': 'Поиск'
 'Toggle the menu': 'Переключить меню'
 'Open the documentation': 'Open the documentation'
-'Ask the developer': 'Спросить разработчика'
+'Ask the developer': 'Ask the developer'
-'New request': 'Новый запрос'
+'New request': 'New request'
-'Report a bug': 'Пожаловаться на ошибку'
+'Report a bug': 'Report a bug'
-'Show the configuration': 'Показать конфигурацию'
+'Show the configuration': 'Show the configuration'
 'Configuration:': 'Configuration:'
-'Done!': 'Готово!'
+'Done!': 'Done!'
-'Copy': 'Копировать'
+'Copy': 'Copy'
-'Need help': 'Нужна помощь'
+'Need help': 'Need help'
-'I would like a new feature': 'Я хочу новую возможность'
+'I would like a new feature': 'I would like a new feature'
-'Something went wrong': 'Что-то пошло не так'
+'Something went wrong': 'Something went wrong'
-'Select apps': 'Выберете приложения'
+'Select apps': 'Select apps'
-'Sort': 'Сортировать'
+'Sort': 'Sort'
-'Customize': 'Приспособить'
+'Customize': 'Customize'
 'Custom': 'Custom'
-'Close': 'Закрыть'
+'Close': 'Close'

src/l10n/fixtures/sk.yaml

@@ -90,7 +90,7 @@
 'Applications kept in the top menu but also shown in side menu': 'Applications kept in the top menu but also shown in side menu'
 'These applications must be selected in the previous option.': 'These applications must be selected in the previous option.'
 'Hide labels on mouse over': 'Hide labels on mouse over'
-'Toggle the menu': 'Prepnite ponuku'
+'Toggle the menu': 'Toggle the menu'
 'Open the documentation': 'Open the documentation'
 'Ask the developer': 'Ask the developer'
 'New request': 'New request'

src/l10n/fixtures/sv.yaml

@@ -1,111 +0,0 @@
-'Custom menu': ''
-'Enable the custom menu': ''
-'No': ''
-'Yes': ''
-'Menu': ''
-'Use the shortcut Ctrl+o to open and to hide the side menu. Use tab key to navigate.': ''
-'Top menu': ''
-'Apps that not must be moved in the side menu': ''
-'If there is no selection then the global configuration is applied.': ''
-'Experimental': ''
-'Save': ''
-'You like this app and you want to support me?': ''
-'Buy me a coffee ☕': ''
-'Hidden': ''
-'Small': ''
-'Normal': ''
-'Big': ''
-'Hidden icon': ''
-'Small icon': ''
-'Normal icon': ''
-'Big icon': ''
-'Hidden text': ''
-'Small text': ''
-'Normal text': ''
-'Big text': ''
-'Colors': ''
-'Background color': ''
-'Background color of current app': ''
-'Text color': ''
-'Loader': ''
-'Icon': ''
-'Same color': ''
-'Opposite color': ''
-'Transparent': ''
-'Opaque': ''
-'Opener': ''
-'Default': ''
-'Default (dark)': ''
-'Hamburger': ''
-'Hamburger (dark)': ''
-'Hamburger 2': ''
-'Hamburger 2 (dark)': ''
-'Before the logo': ''
-'After the logo': ''
-'Position': ''
-'Show only the opener (hidden logo)': ''
-'Do not display the side menu and the opener if there is no application (eg: public pages).': ''
-'Panel': ''
-'Open the menu when the mouse is hover the opener (automatically disabled on touch screens)': ''
-'Display the big menu': ''
-'Display the logo': ''
-'Icons and texts': ''
-'Loader enabled': ''
-'Tips': ''
-'Always displayed': ''
-'This is the automatic behavior when the menu is always displayed.': ''
-'Not compatible with touch screens.': ''
-'Big menu': ''
-'Live preview': ''
-'Open apps in new tab': ''
-'Use the global setting': ''
-'Use my selection': ''
-'Show and hide the list of applications': ''
-'Use the avatar instead of the logo': ''
-'You do not have permission to change the settings.': ''
-'Force this configuration to users': ''
-'Export the configuration': ''
-'Purge the cache': ''
-'Show the link to settings': ''
-'The menu is enabled by default for users': ''
-'Except when the configuration is forced.': ''
-'Apps that should not be displayed in the menu': ''
-'This feature is only compatible with the <code>big menu</code> display.': ''
-'The logo is a link to the default app': ''
-'Others': ''
-'Categories': ''
-'Customize sorting': ''
-'Order by': ''
-'Name': ''
-'Customed': ''
-'Show and hide the list of categories': ''
-'This parameters are used when Dark theme or Breeze Dark Theme are enabled.': ''
-'Dark mode colors': ''
-'With categories': ''
-'Custom categories': ''
-'Customize application categories': ''
-'Reset to default': ''
-'Applications': ''
-'Applications kept in the top menu': ''
-'Applications kept in the top menu but also shown in side menu': ''
-'These applications must be selected in the previous option.': ''
-'Hide labels on mouse over': ''
-'Except the hovered app': ''
-'Search': ''
-'Toggle the menu': ''
-'Open the documentation': ''
-'Ask the developer': ''
-'New request': ''
-'Report a bug': ''
-'Show the configuration': ''
-'Configuration:': ''
-'Done!': ''
-'Copy': ''
-'Need help': ''
-'I would like a new feature': ''
-'Something went wrong': ''
-'Select apps': ''
-'Sort': ''
-'Customize': ''
-'Custom': ''
-'Close': ''

src/l10n/fixtures/zh_CN.yaml

@@ -1,9 +1,9 @@
 'Custom menu': '自定义菜单'
 'Enable the custom menu': '启用自定义菜单'
-'No': '否'
+'No': '取消'
-'Yes': '是'
+'Yes': '确定'
 'Menu': '菜单'
-'Use the shortcut Ctrl+o to open and to hide the side menu. Use <span class="keyboard-key">tab</span> to navigate.': '使用快捷键 Ctrl+o 打开或隐藏侧边栏菜单。使用 <span class="keyboard-key">Tab</span> 键来导航。'
+'Use the shortcut Ctrl+o to open and to hide the side menu. Use <span class="keyboard-key">tab</span> to navigate.': '使用快捷键 Ctrl+o 打开或隐藏侧边栏菜单。使用<span class="keyboard-key">tab</span> 来导航。'
 'Top menu': '顶部菜单'
 'Apps that not must be moved in the side menu': '禁止在侧边栏菜单移动的应用'
 'If there is no selection then the global configuration is applied.': '如果没有选择，则应用全局配置。'
@@ -25,7 +25,7 @@
 'Opposite color': '相反颜色'
 'Transparent': '透明'
 'Opaque': '不透明'
-'Opener': '触发器'
+'Opener': '容器'
 'Default': '默认'
 'Default (dark)': '默认(深色)'
 'Hamburger': 'Hamburger'
@@ -35,10 +35,10 @@
 'Before the logo': '在徽标之前'
 'After the logo': '在徽标之后'
 'Position': '位置'
-'Show only the opener (hidden logo)': '仅显示触发器（隐藏徽标）'
+'Show only the opener (hidden logo)': '只显示容器（隐藏徽标）'
-'Do not display the side menu and the opener if there is no application (eg: public pages).': '如果没有应用程序（例如：公共页面），则不要显示侧边栏菜单和触发器。'
+'Do not display the side menu and the opener if there is no application (eg: public pages).': '如果没有应用程序（例如：公共页面），则不要显示侧边栏菜单和容器。'
 'Panel': '面板'
-'Open the menu when the mouse is hover the opener (automatically disabled on touch screens)': '‌当鼠标悬停在触发器上时打开菜单（在触摸屏上自动禁用）'
+'Open the menu when the mouse is hover the opener (automatically disabled on touch screens)': '鼠标悬停时打开菜单 (触摸屏时将自动禁用)'
 'Display the big menu': '显示大型菜单'
 'Display the logo': '显示徽标'
 'Icons and texts': '图标和文本'
@@ -63,7 +63,7 @@
 'Except when the configuration is forced.': '除非强制配置。'
 'Apps that should not be displayed in the menu': '禁止在菜单中显示的应用'
 'This feature is only compatible with the <code>big menu</code> display.': '此功能只和<code>大型菜单</code>兼容。'
-'The logo is a link to the default app': '徽标链接到默认应用'
+'The logo is a link to the default app': 'logo链接到默认应用'
 'Others': '其他'
 'Categories': '类别'
 'Customize sorting': '自定义排序'
@@ -85,27 +85,27 @@
 'Small text': '小文本'
 'Normal text': '普通文本'
 'Big text': '大文本'
-'Applications': '应用程序'
+'Applications': 'Applications'
-'Applications kept in the top menu': '应用程序保留在顶部菜单中'
+'Applications kept in the top menu': 'Applications kept in the top menu'
-'Applications kept in the top menu but also shown in side menu': '应用程序保留在顶部菜单中，但也显示在侧边栏菜单中'
+'Applications kept in the top menu but also shown in side menu': 'Applications kept in the top menu but also shown in side menu'
-'These applications must be selected in the previous option.': '必须在上一个选项中选择这些应用程序。'
+'These applications must be selected in the previous option.': 'These applications must be selected in the previous option.'
-'Hide labels on mouse over': '鼠标悬停时隐藏标签'
+'Hide labels on mouse over': 'Hide labels on mouse over'
-'Except the hovered app': '除了悬停的应用'
+'Except the hovered app': 'Except the hovered app'
-'Search': '搜索'
+'Search': 'Search'
-'Toggle menu': '切换菜单'
+'Toggle menu': 'Toggle menu'
-'Open the documentation': '打开文档'
+'Open the documentation': 'Open the documentation'
-'Ask the developer': '询问开发者'
+'Ask the developer': 'Ask the developer'
-'New request': '新请求'
+'New request': 'New request'
-'Report a bug': '报告错误'
+'Report a bug': 'Report a bug'
-'Show the configuration': '显示配置'
+'Show the configuration': 'Show the configuration'
-'Configuration:': '配置：'
+'Configuration:': 'Configuration:'
-'Done!': '完成！'
+'Done!': 'Done!'
-'Copy': '复制'
+'Copy': 'Copy'
-'Need help': '需要帮助'
+'Need help': 'Need help'
-'I would like a new feature': '我想要一个新功能'
+'I would like a new feature': 'I would like a new feature'
-'Something went wrong': '出了点问题'
+'Something went wrong': 'Something went wrong'
-'Select apps': '选择应用'
+'Select apps': 'Select apps'
-'Sort': '排序'
+'Sort': 'Sort'
-'Customize': '自定义'
+'Customize': 'Customize'
-'Custom': '自定义'
+'Custom': 'Custom'
-'Close': '关闭'
+'Close': 'Close'