Merge branch 'translations' into develop

Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/442

CHANGELOG.md

@@ -1,7 +1,10 @@
 ## [Unreleased]
 
+## 5.1.2
+### Added
+* add new translations
 ### Fixed
-* fix #415: move admin navigation opener to the right
+* fix #441: Side bar not working with Nextcloud 32 (thanks to AndyXheli)
 
 ## 5.1.1
 ### Fixed
@@ -200,7 +203,7 @@
 
 ## 3.5.1
 ### Added
-* add translations (thanks to p-bo adn gallegonovato)
+* add translations (thanks to p-bo and gallegonovato)
 ### Fixed
 * fix #189: sorting not applied on mobile
 

appinfo/info.xml

@@ -30,7 +30,7 @@ Notice
 Because I believe in a free and decentralized Internet, [Gitnet](https://gitnet.fr) is **self-hosted at home**.
 In case of downtime, you can download **Custom Menu** from [here](https://kim.deblan.fr/~side_menu/).
 ]]></description>
-    <version>5.1.1</version>
+    <version>5.1.2</version>
     <licence>agpl</licence>
     <author mail="contact@deblan.fr" homepage="https://www.deblan.fr/">Simon Vieille</author>
     <namespace>SideMenu</namespace>

lib/Controller/JsController.php

@@ -20,7 +20,6 @@
 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;
@@ -29,10 +28,12 @@ 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
 {
@@ -44,14 +45,13 @@ 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->themingDefaults = $themingDefaults;
-
-        $this->user = \OC::$server[IUserSession::class]->getUser();
-        $this->config = $config;
-        $this->l10nFactory = $l10nFactory;
+        $this->user = $this->userSession->getUser();
     }
 
     #[NoCSRFRequired]
@@ -99,25 +99,25 @@ class JsController extends Controller
                 $targetBlankApps = $userTargetBlankApps;
             }
 
-            $isAvatarSet = \OC::$server->getAvatarManager()->getAvatar($this->user->getUid())->exists();
+            $isAvatarSet = $this->avatarManager->getAvatar($this->user->getUID())->exists();
 
             if ($useAvatar && $isAvatarSet) {
-                $avatar = \OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', [
-                    'userId' => $this->user->getUid(),
+                $avatar = $this->urlGenerator->linkToRoute('core.avatar.getAvatar', [
+                    'userId' => $this->user->getUID(),
                     'size' => 128,
                     'v' => $this->config->getUserValueInt($this->user, 'avatar', 'version', 0),
                 ]);
             }
 
             if ($this->config->getAppValueBool('show-settings', '0')) {
-                $settingsNav = \OC::$server->getNavigationManager()->getAll('settings');
+                $settingsNav = $this->navigationManager->getAll('settings');
 
                 if (isset($settingsNav['settings'])) {
                     $settings = [
                         'href' => $settingsNav['settings']['href'],
                         'name' => $settingsNav['settings']['name'],
-                        'avatar' => \OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', [
-                            'userId' => $this->user->getUid(),
+                        'avatar' => $this->urlGenerator->linkToRoute('core.avatar.getAvatar', [
+                            'userId' => $this->user->getUID(),
                             'size' => 32,
                             'v' => $this->config->getUserValueInt($this->user, 'avatar', 'version', 0),
                         ]),
@@ -126,7 +126,7 @@ class JsController extends Controller
             }
         }
 
-        $indexUrl = \OC::$server->getURLGenerator()->linkTo('', 'index.php');
+        $indexUrl = $this->urlGenerator->linkTo('', 'index.php');
 
         return [
             'opener-position' => $this->config->getAppValue('opener-position', 'before'),

src/l10n/fixtures/cs.yaml

@@ -94,18 +94,18 @@
 'Search': 'Hledat'
 'Toggle the menu': 'Vyp/zap nabídku'
 'Open the documentation': 'Open the documentation'
-'Ask the developer': 'Ask the developer'
-'New request': 'New request'
-'Report a bug': 'Report a bug'
-'Show the configuration': 'Show the configuration'
+'Ask the developer': 'Zeptejte se vývojáře'
+'New request': 'Nový požadavek'
+'Report a bug': 'Nahlásit chybu'
+'Show the configuration': 'Zobrazit nastavení'
 'Configuration:': 'Configuration:'
-'Done!': 'Done!'
-'Copy': 'Copy'
-'Need help': 'Need help'
-'I would like a new feature': 'I would like a new feature'
-'Something went wrong': 'Something went wrong'
-'Select apps': 'Select apps'
-'Sort': 'Sort'
-'Customize': 'Customize'
+'Done!': 'Hotovo!'
+'Copy': 'Zkopírovat'
+'Need help': 'Potřebuji pomoc'
+'I would like a new feature': 'Rád bych novou funkci v aplikaci'
+'Something went wrong': 'Něco se pokazilo'
+'Select apps': 'Vyberte aplikace'
+'Sort': 'Seřadit'
+'Customize': 'Přizpůsobit'
 'Custom': 'Custom'
-'Close': 'Close'
+'Close': 'Zavřít'

src/l10n/fixtures/fr.yaml

@@ -1,4 +1,4 @@
-'Custom menu': '­­­Menu personnalisé'
+'Custom menu': 'Menu personnalisé'
 'Enable the custom menu': 'Activer le menu personnalisé'
 'No': 'Non'
 'Yes': 'Oui'

src/l10n/fixtures/gl.yaml

@@ -3,7 +3,7 @@
 'No': 'Non'
 'Yes': 'Si'
 'Menu': 'Menú'
-'Use the shortcut Ctrl+o to open and to hide the side menu. Use tab key to navigate.': 'Use the shortcut Ctrl+o to open and to hide the side menu. Use tab key to navigate.'
+'Use the shortcut Ctrl+o to open and to hide the side menu. Use tab key to navigate.': 'Use o atallo Ctrl+o para abrir e agochar o menú lateral. Use a tecla Tab para navegar.'
 'Top menu': 'Top menu'
 'Apps that not must be moved in the side menu': 'As aplicacións que non deben moverse no menú lateral'
 'If there is no selection then the global configuration is applied.': 'Se non hai selección, aplícase a configuración global.'
@@ -94,18 +94,18 @@
 'Search': 'Buscar'
 'Toggle the menu': 'Alternar o menú'
 'Open the documentation': 'Open the documentation'
-'Ask the developer': 'Ask the developer'
-'New request': 'New request'
-'Report a bug': 'Report a bug'
-'Show the configuration': 'Show the configuration'
-'Configuration:': 'Configuration:'
-'Done!': 'Done!'
-'Copy': 'Copy'
-'Need help': 'Need help'
-'I would like a new feature': 'I would like a new feature'
-'Something went wrong': 'Something went wrong'
-'Select apps': 'Select apps'
-'Sort': 'Sort'
-'Customize': 'Customize'
-'Custom': 'Custom'
-'Close': 'Close'
+'Ask the developer': 'Preguntar ao desenvolvedor'
+'New request': 'Nova solicitude'
+'Report a bug': 'Informar dun fallo'
+'Show the configuration': 'Amosar a configuración'
+'Configuration:': 'Configuración:'
+'Done!': 'Feito!'
+'Copy': 'Copiar'
+'Need help': 'Necesito axuda'
+'I would like a new feature': 'Gustaríame unha nova característica'
+'Something went wrong': 'Algo foi mal'
+'Select apps': 'Seleccionar as aplicacións'
+'Sort': 'Ordenar'
+'Customize': 'Personalizar'
+'Custom': 'Personalizado'
+'Close': 'Pechar'

src/l10n/fixtures/ru.yaml

@@ -1,4 +1,4 @@
-'Custom menu': 'Custom menu'
+'Custom menu': 'Пользовательское меню'
 'Enable the custom menu': 'Включить пользовательское меню'
 'No': 'Нет'
 'Yes': 'Да'
@@ -77,7 +77,7 @@
 'Customize sorting': 'Настроить сортировку'
 'Order by': 'В порядке'
 'Name': 'Название'
-'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': 'Цвета тёмной темы'

src/l10n/fixtures/sv.yaml

@@ -1,111 +1,111 @@
-'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': ''
+'Custom menu': 'Anpassad meny'
+'Enable the custom menu': 'Aktivera den anpassade menyn'
+'No': 'Nej'
+'Yes': 'Ja'
+'Menu': 'Meny'
+'Use the shortcut Ctrl+o to open and to hide the side menu. Use tab key to navigate.': 'Använd genvägen Ctrl+o för att visa eller dölja sidomenyn. Använd tabb-tangenten för att navigera.'
+'Top menu': 'Toppmeny'
+'Apps that not must be moved in the side menu': 'Appar som inte får flyttas i sidomenyn'
+'If there is no selection then the global configuration is applied.': 'Om inget val har gjorts tillämpas den globala konfigurationen.'
+'Experimental': 'Experimentell'
+'Save': 'Spara'
+'You like this app and you want to support me?': 'Gillar du den här appen och vill stödja mig?'
+'Buy me a coffee ☕': 'Bjud mig på en kaffe ☕'
+'Hidden': 'Dold'
+'Small': 'Liten'
+'Normal': 'Normal'
+'Big': 'Stor'
+'Hidden icon': 'Dold ikon'
+'Small icon': 'Liten ikon'
+'Normal icon': 'Normal ikon'
+'Big icon': 'Stor ikon'
+'Hidden text': 'Dold text'
+'Small text': 'Liten text'
+'Normal text': 'Normal text'
+'Big text': 'Stor text'
+'Colors': 'Färger'
+'Background color': 'Bakgrundsfärg'
+'Background color of current app': 'Bakgrundsfärg för aktuell app'
+'Text color': 'Textfärg'
+'Loader': 'Laddare'
+'Icon': 'Ikon'
+'Same color': 'Samma färg'
+'Opposite color': 'Motsatt färg'
+'Transparent': 'Transparent'
+'Opaque': 'Ogenomskinlig'
+'Opener': 'Öppnare'
+'Default': 'Standard'
+'Default (dark)': 'Standard(mörk)'
+'Hamburger': 'Hamburgermeny'
+'Hamburger (dark)': 'Hamburgermeny(mörk)'
+'Hamburger 2': 'Hamburgermeny 2'
+'Hamburger 2 (dark)': 'Hamburgermeny 2 (mörk)'
+'Before the logo': 'Före logotypen'
+'After the logo': 'Efter logotypen'
+'Position': 'Position'
+'Show only the opener (hidden logo)': 'Visa endast öppnaren (gömd logotyp)'
+'Do not display the side menu and the opener if there is no application (eg: public pages).': 'Visa inte sidomenyn eller öppnaren om det inte finns någon applikation (t.ex. publika sidor).'
+'Panel': 'Panel'
+'Open the menu when the mouse is hover the opener (automatically disabled on touch screens)': 'Öppna menyn när muspekaren hovrar över öppnaren (automatiskt avaktiverat på pekskärmar)'
+'Display the big menu': 'Visa den stora menyn'
+'Display the logo': 'Visa logotypen'
+'Icons and texts': 'Ikoner och texter'
+'Loader enabled': 'Laddare aktiverad'
+'Tips': 'Tips'
+'Always displayed': 'Alltid visad'
+'This is the automatic behavior when the menu is always displayed.': 'Detta är det automatiska beteendet när menyn alltid är visad.'
+'Not compatible with touch screens.': 'Inte kompatibel med pekskärmar.'
+'Big menu': 'Stor meny'
+'Live preview': 'Förhandsgranskning i realtid'
+'Open apps in new tab': 'Öppna appar i ny flik'
+'Use the global setting': 'Använd den globala inställningen'
+'Use my selection': 'Använd mitt val'
+'Show and hide the list of applications': 'Visa och dölj listan över applikationer'
+'Use the avatar instead of the logo': 'Använd avataren istället för logotypen'
+'You do not have permission to change the settings.': 'Du har inte behörighet att ändra inställningarna.'
+'Force this configuration to users': 'Tvinga denna konfiguration för användare'
+'Export the configuration': 'Exportera konfigurationen'
+'Purge the cache': 'Rensa cachen'
+'Show the link to settings': 'Visa länken till inställningarna'
+'The menu is enabled by default for users': 'Menyn är aktiverad som standard för användare'
+'Except when the configuration is forced.': 'Förutom när konfigurationen är tvingad.'
+'Apps that should not be displayed in the menu': 'Appar som inte ska visas i menyn'
+'This feature is only compatible with the <code>big menu</code> display.': 'Denna funktion är endast kompatibel med <code>stor meny</code>.'
+'The logo is a link to the default app': 'Logotypen är en länk till standardappen'
+'Others': 'Övriga'
+'Categories': 'Kategorier'
+'Customize sorting': 'Anpassa sortering'
+'Order by': 'Sortera efter'
+'Name': 'Namn'
+'Customed': 'Anpassad'
+'Show and hide the list of categories': 'Visa och dölj listan över kategorier'
+'This parameters are used when Dark theme or Breeze Dark Theme are enabled.': 'Dessa parametrar används när mörkt tema eller Breeze Dark Theme är aktiverade.'
+'Dark mode colors': 'Färger för mörkt läge'
+'With categories': 'Med kategorier'
+'Custom categories': 'Anpassade kategorier'
+'Customize application categories': 'Anpassa app kategorier'
+'Reset to default': 'Återställ till standardvärden'
+'Applications': 'Applikationer'
+'Applications kept in the top menu': 'Applikationer som hålls i toppmenyn'
+'Applications kept in the top menu but also shown in side menu': 'Applikationer som visas både i toppmenyn och i sidomenyn'
+'These applications must be selected in the previous option.': 'Dessa applikationer måste väljas i föregående alternativ.'
+'Hide labels on mouse over': 'Dölj etiketter när muspekaren är över'
+'Except the hovered app': 'Förutom den app som muspekaren är över'
+'Search': 'Sök'
+'Toggle the menu': 'Växla menyn'
+'Open the documentation': 'Öppna dokumentationen'
+'Ask the developer': 'Fråga utvecklaren'
+'New request': 'Ny förfrågan'
+'Report a bug': 'Rapportera ett fel'
+'Show the configuration': 'Visa konfigurationen'
+'Configuration:': 'Konfiguration:'
+'Done!': 'Klar!'
+'Copy': 'Kopiera'
+'Need help': 'Behöver hjälp'
+'I would like a new feature': 'Jag skulle vilja ha en ny funktion'
+'Something went wrong': 'Något gick fel'
+'Select apps': 'Välj appar'
+'Sort': 'Sortera'
+'Customize': 'Anpassa'
+'Custom': 'Anpassad'
+'Close': 'Stäng'

src/scss/admin.scss

@@ -32,11 +32,6 @@
     .app-navigation-entry__name {
       padding-left: 10px !important;
     }
-
-    .app-navigation-toggle-wrapper {
-      top: calc(var(--app-navigation-padding) - 3px) !important;
-      inset-inline-end: calc(0px - var(--app-navigation-padding) * 3) !important;
-    }
   }
 
   &-tips {