Merge pull request 'develop' (#508) from develop into master

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

.gitignore

@@ -2,8 +2,4 @@
 /node_modules
 /l10n/*
 /releases
-/package-lock.json
 !/l10n/.gitkeep
-/yarn*.log
-/src/admin.js.bk
-/templates/settings/admin-form.php.bk

README.md

@@ -40,7 +40,7 @@ If you want to install it from source, go to https://gitnet.fr/deblan/side_menu/
 
 ```
 $ cd /path/to/nextcloud/apps
-$ VERSION=x.y.z; curl -sS https://gitnet.fr/deblan/side_menu/releases/download/v${VERSION}/side_menu_v${VERSION}.tar.gz | tar xvfz -
+$ VERSION=x.y.z; curl -sS "https://gitnet.fr/deblan/side_menu/releases/download/${VERSION}/side_menu_v${VERSION}.tar.gz" | tar xvfz -
 ```
 
 Administrators can edit many settings using the administration page.

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>6.0.1</version>
     <licence>agpl</licence>
     <author mail="contact@deblan.fr" homepage="https://www.deblan.fr/">Simon Vieille</author>
     <namespace>SideMenu</namespace>
@@ -52,8 +52,8 @@ In case of downtime, you can download **Custom Menu** from [here](https://kim.de
     <screenshot><![CDATA[https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc25_big_menu.png]]></screenshot>
     <screenshot><![CDATA[https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc25_default_menu.png]]></screenshot>
     <dependencies>
-        <php min-version="8.1" max-version="8.4" />
+        <php min-version="8.1" max-version="8.5" />
-        <nextcloud min-version="31" max-version="32"/>
+        <nextcloud min-version="34" max-version="34"/>
     </dependencies>
     <settings>
         <admin>OCA\SideMenu\Settings\Admin</admin>

lib/AppInfo/Application.php

@@ -6,6 +6,7 @@ use OC\AllConfig;
 use OC\App\AppStore\Fetcher\CategoryFetcher;
 use OC\AppFramework\Http\Request;
 use OC\Security\CSP\ContentSecurityPolicyNonceManager;
+use OC\Security\CSRF\CsrfTokenManager;
 use OC\User\User;
 use OCA\SideMenu\Service\AppRepository;
 use OCA\SideMenu\Service\CategoryRepository;
@@ -19,8 +20,11 @@ use OCP\AppFramework\Bootstrap\IRegistrationContext;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IConfig;
 use OCP\INavigationManager;
+use OCP\IRequest;
+use OCP\IURLGenerator;
 use OCP\IUserSession;
 use OCP\L10N\IFactory;
+use OCP\Server;
 use OCP\Util;
 use Psr\Container\ContainerInterface;
 
@@ -34,9 +38,9 @@ class Application extends App implements IBootstrap
     public const APP_ID = 'side_menu';
     public const APP_NAME = 'Custom menu';
 
-    protected AllConfig $config;
+    protected IConfig $config;
     protected ContentSecurityPolicyNonceManager $cspnm;
-    protected Request $request;
+    protected IRequest $request;
     protected ?User $user = null;
 
     public function __construct(array $urlParams = [])
@@ -83,10 +87,9 @@ class Application extends App implements IBootstrap
 
     public function boot(IBootContext $context): void
     {
-        $this->config = \OC::$server->getConfig();
+        $this->config = Server::get(IConfig::class);
-        $this->cspnm = \OC::$server->getContentSecurityPolicyNonceManager();
+        $this->user = Server::get(IUserSession::class)->getUser();
-        $this->user = \OC::$server[IUserSession::class]->getUser();
+        $this->request = Server::get(IRequest::class);
-        $this->request = \OC::$server->getRequest();
 
         if (!$this->isEnabled()) {
             return;
@@ -138,7 +141,7 @@ class Application extends App implements IBootstrap
         $cache = $this->config->getAppValue(self::APP_ID, 'cache', '0');
 
         foreach ($assets as $value) {
-            $route = \OC::$server->getURLGenerator()->linkToRoute(
+            $route = Server::get(IURLGenerator::class)->linkToRoute(
                 $value['route'],
                 ['v' => $cache]
             );

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->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 = \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', [
+                $avatar = $this->urlGenerator->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 = \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', [
+                        'avatar' => $this->urlGenerator->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 = \OC::$server->getURLGenerator()->linkTo('', 'index.php');
+        $indexUrl = $this->urlGenerator->linkTo('', 'index.php');
 
         return [
             'opener-position' => $this->config->getAppValue('opener-position', 'before'),

lib/Service/LangRepository.php

@@ -30,7 +30,12 @@ class LangRepository
             ->from('preferences')
         ;
 
+        // Nextcloud >=33+
+        if (method_exists($qb, 'executeQuery')) {
+            $stmt = $qb->executeQuery();
+        } else {
             $stmt = $qb->execute();
+        }
 
         $langs = ['en'];
 

package.json

@@ -11,8 +11,9 @@
   },
   "dependencies": {
     "@babel/core": ">=7.12.0 <8.0.0",
+    "@formatjs/intl-segmenter": "^12.0.8",
     "@nextcloud/router": "^3.0.1",
-    "@nextcloud/vue": "^9.0.0-alpha.8",
+    "@nextcloud/vue": "^9.9.0",
     "node-polyfill-webpack-plugin": "^4.1.0",
     "pinia": "^3.0.1",
     "postcss": "^7.0.0 || ^8.0.1",

src/admin.js

@@ -17,6 +17,8 @@
 
 import './scss/admin.scss'
 
+import '@formatjs/intl-segmenter/polyfill.js'
+
 import { createApp } from 'vue'
 import { createPinia } from 'pinia'
 import { waitContainer } from './lib/dom.js'

src/components/settings/AdminSaveButton.vue

@@ -73,10 +73,10 @@ const save = async () => {
         if (Array.isArray(value) || typeof value === 'object') {
           value = JSON.stringify(value)
         } else if (typeof value === 'boolean') {
-          value = value ? 1 : 0
+          value = value ? '1' : '0'
         }
 
-        OCP.AppConfig.setValue('side_menu', key, value, {
+        OCP.AppConfig.setValue('side_menu', key, value.toString(), {
           success() {
             update()
           },

src/components/settings/UserSaveButton.vue

@@ -69,11 +69,11 @@ const save = async () => {
     if (Array.isArray(value) || typeof value === 'object') {
       value = JSON.stringify(value)
     } else if (typeof value === 'boolean') {
-      value = value ? 1 : 0
+      value = value ? '1' : '0'
     }
 
     formData.push('name=' + encodeURIComponent(key))
-    formData.push('value=' + encodeURIComponent(value))
+    formData.push('value=' + encodeURIComponent(value.toString()))
 
     fetch(url, {
       method: 'POST',

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'
+'Ask the developer': 'Zeptejte se vývojáře'
-'New request': 'New request'
+'New request': 'Nový požadavek'
-'Report a bug': 'Report a bug'
+'Report a bug': 'Nahlásit chybu'
-'Show the configuration': 'Show the configuration'
+'Show the configuration': 'Zobrazit nastavení'
 'Configuration:': 'Configuration:'
-'Done!': 'Done!'
+'Done!': 'Hotovo!'
-'Copy': 'Copy'
+'Copy': 'Zkopírovat'
-'Need help': 'Need help'
+'Need help': 'Potřebuji pomoc'
-'I would like a new feature': 'I would like a new feature'
+'I would like a new feature': 'Rád bych novou funkci v aplikaci'
-'Something went wrong': 'Something went wrong'
+'Something went wrong': 'Něco se pokazilo'
-'Select apps': 'Select apps'
+'Select apps': 'Vyberte aplikace'
-'Sort': 'Sort'
+'Sort': 'Seřadit'
-'Customize': 'Customize'
+'Customize': 'Přizpůsobit'
 'Custom': 'Custom'
-'Close': 'Close'
+'Close': 'Zavřít'

src/l10n/fixtures/es.yaml

@@ -94,18 +94,18 @@
 'Search': 'Buscar'
 'Toggle the menu': 'Alternar el menú'
 'Open the documentation': 'Open the documentation'
-'Ask the developer': 'Ask the developer'
+'Ask the developer': 'Pregúntale al desarrollador'
-'New request': 'New request'
+'New request': 'Nueva solicitud'
-'Report a bug': 'Report a bug'
+'Report a bug': 'Informar de un fallo'
-'Show the configuration': 'Show the configuration'
+'Show the configuration': 'Mostrar los ajustes'
 'Configuration:': 'Configuration:'
-'Done!': 'Done!'
+'Done!': '¡Realizado!'
-'Copy': 'Copy'
+'Copy': 'Copiar'
-'Need help': 'Need help'
+'Need help': 'Ayudame'
-'I would like a new feature': 'I would like a new feature'
+'I would like a new feature': 'Me gustaría una nueva función'
-'Something went wrong': 'Something went wrong'
+'Something went wrong': 'Algo salió mal'
-'Select apps': 'Select apps'
+'Select apps': 'Selecciona las aplicaciones'
-'Sort': 'Sort'
+'Sort': 'Ordenar'
-'Customize': 'Customize'
+'Customize': 'Personalizar'
 'Custom': 'Custom'
-'Close': 'Close'
+'Close': 'Cerrar'

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'
+'Ask the developer': 'Preguntar ao desenvolvedor'
-'New request': 'New request'
+'New request': 'Nova solicitude'
-'Report a bug': 'Report a bug'
+'Report a bug': 'Informar dun fallo'
-'Show the configuration': 'Show the configuration'
+'Show the configuration': 'Amosar a configuración'
-'Configuration:': 'Configuration:'
+'Configuration:': 'Configuración:'
-'Done!': 'Done!'
+'Done!': 'Feito!'
-'Copy': 'Copy'
+'Copy': 'Copiar'
-'Need help': 'Need help'
+'Need help': 'Necesito axuda'
-'I would like a new feature': 'I would like a new feature'
+'I would like a new feature': 'Gustaríame unha nova característica'
-'Something went wrong': 'Something went wrong'
+'Something went wrong': 'Algo foi mal'
-'Select apps': 'Select apps'
+'Select apps': 'Seleccionar as aplicacións'
-'Sort': 'Sort'
+'Sort': 'Ordenar'
-'Customize': 'Customize'
+'Customize': 'Personalizar'
-'Custom': 'Custom'
+'Custom': 'Personalizado'
-'Close': 'Close'
+'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': ''
+'Custom menu': 'Anpassad meny'
-'Enable the custom menu': ''
+'Enable the custom menu': 'Aktivera den anpassade menyn'
-'No': ''
+'No': 'Nej'
-'Yes': ''
+'Yes': 'Ja'
-'Menu': ''
+'Menu': 'Meny'
-'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.': 'Använd genvägen Ctrl+o för att visa eller dölja sidomenyn. Använd tabb-tangenten för att navigera.'
-'Top menu': ''
+'Top menu': 'Toppmeny'
-'Apps that not must be moved in the side menu': ''
+'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.': ''
+'If there is no selection then the global configuration is applied.': 'Om inget val har gjorts tillämpas den globala konfigurationen.'
-'Experimental': ''
+'Experimental': 'Experimentell'
-'Save': ''
+'Save': 'Spara'
-'You like this app and you want to support me?': ''
+'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 ☕': ''
+'Buy me a coffee ☕': 'Bjud mig på en kaffe ☕'
-'Hidden': ''
+'Hidden': 'Dold'
-'Small': ''
+'Small': 'Liten'
-'Normal': ''
+'Normal': 'Normal'
-'Big': ''
+'Big': 'Stor'
-'Hidden icon': ''
+'Hidden icon': 'Dold ikon'
-'Small icon': ''
+'Small icon': 'Liten ikon'
-'Normal icon': ''
+'Normal icon': 'Normal ikon'
-'Big icon': ''
+'Big icon': 'Stor ikon'
-'Hidden text': ''
+'Hidden text': 'Dold text'
-'Small text': ''
+'Small text': 'Liten text'
-'Normal text': ''
+'Normal text': 'Normal text'
-'Big text': ''
+'Big text': 'Stor text'
-'Colors': ''
+'Colors': 'Färger'
-'Background color': ''
+'Background color': 'Bakgrundsfärg'
-'Background color of current app': ''
+'Background color of current app': 'Bakgrundsfärg för aktuell app'
-'Text color': ''
+'Text color': 'Textfärg'
-'Loader': ''
+'Loader': 'Laddare'
-'Icon': ''
+'Icon': 'Ikon'
-'Same color': ''
+'Same color': 'Samma färg'
-'Opposite color': ''
+'Opposite color': 'Motsatt färg'
-'Transparent': ''
+'Transparent': 'Transparent'
-'Opaque': ''
+'Opaque': 'Ogenomskinlig'
-'Opener': ''
+'Opener': 'Öppnare'
-'Default': ''
+'Default': 'Standard'
-'Default (dark)': ''
+'Default (dark)': 'Standard(mörk)'
-'Hamburger': ''
+'Hamburger': 'Hamburgermeny'
-'Hamburger (dark)': ''
+'Hamburger (dark)': 'Hamburgermeny(mörk)'
-'Hamburger 2': ''
+'Hamburger 2': 'Hamburgermeny 2'
-'Hamburger 2 (dark)': ''
+'Hamburger 2 (dark)': 'Hamburgermeny 2 (mörk)'
-'Before the logo': ''
+'Before the logo': 'Före logotypen'
-'After the logo': ''
+'After the logo': 'Efter logotypen'
-'Position': ''
+'Position': 'Position'
-'Show only the opener (hidden logo)': ''
+'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).': ''
+'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': '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)': 'Öppna menyn när muspekaren hovrar över öppnaren (automatiskt avaktiverat på pekskärmar)'
-'Display the big menu': ''
+'Display the big menu': 'Visa den stora menyn'
-'Display the logo': ''
+'Display the logo': 'Visa logotypen'
-'Icons and texts': ''
+'Icons and texts': 'Ikoner och texter'
-'Loader enabled': ''
+'Loader enabled': 'Laddare aktiverad'
-'Tips': ''
+'Tips': 'Tips'
-'Always displayed': ''
+'Always displayed': 'Alltid visad'
-'This is the automatic behavior when the menu is always displayed.': ''
+'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.': ''
+'Not compatible with touch screens.': 'Inte kompatibel med pekskärmar.'
-'Big menu': ''
+'Big menu': 'Stor meny'
-'Live preview': ''
+'Live preview': 'Förhandsgranskning i realtid'
-'Open apps in new tab': ''
+'Open apps in new tab': 'Öppna appar i ny flik'
-'Use the global setting': ''
+'Use the global setting': 'Använd den globala inställningen'
-'Use my selection': ''
+'Use my selection': 'Använd mitt val'
-'Show and hide the list of applications': ''
+'Show and hide the list of applications': 'Visa och dölj listan över applikationer'
-'Use the avatar instead of the logo': ''
+'Use the avatar instead of the logo': 'Använd avataren istället för logotypen'
-'You do not have permission to change the settings.': ''
+'You do not have permission to change the settings.': 'Du har inte behörighet att ändra inställningarna.'
-'Force this configuration to users': ''
+'Force this configuration to users': 'Tvinga denna konfiguration för användare'
-'Export the configuration': ''
+'Export the configuration': 'Exportera konfigurationen'
-'Purge the cache': ''
+'Purge the cache': 'Rensa cachen'
-'Show the link to settings': ''
+'Show the link to settings': 'Visa länken till inställningarna'
-'The menu is enabled by default for users': ''
+'The menu is enabled by default for users': 'Menyn är aktiverad som standard för användare'
-'Except when the configuration is forced.': ''
+'Except when the configuration is forced.': 'Förutom när konfigurationen är tvingad.'
-'Apps that should not be displayed in the menu': ''
+'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.': ''
+'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': ''
+'The logo is a link to the default app': 'Logotypen är en länk till standardappen'
-'Others': ''
+'Others': 'Övriga'
-'Categories': ''
+'Categories': 'Kategorier'
-'Customize sorting': ''
+'Customize sorting': 'Anpassa sortering'
-'Order by': ''
+'Order by': 'Sortera efter'
-'Name': ''
+'Name': 'Namn'
-'Customed': ''
+'Customed': 'Anpassad'
-'Show and hide the list of categories': ''
+'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.': ''
+'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': ''
+'Dark mode colors': 'Färger för mörkt läge'
-'With categories': ''
+'With categories': 'Med kategorier'
-'Custom categories': ''
+'Custom categories': 'Anpassade kategorier'
-'Customize application categories': ''
+'Customize application categories': 'Anpassa app kategorier'
-'Reset to default': ''
+'Reset to default': 'Återställ till standardvärden'
-'Applications': ''
+'Applications': 'Applikationer'
-'Applications kept in the top menu': ''
+'Applications kept in the top menu': 'Applikationer som hålls i toppmenyn'
-'Applications kept in the top menu but also shown in side menu': ''
+'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.': ''
+'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': ''
+'Hide labels on mouse over': 'Dölj etiketter när muspekaren är över'
-'Except the hovered app': ''
+'Except the hovered app': 'Förutom den app som muspekaren är över'
-'Search': ''
+'Search': 'Sök'
-'Toggle the menu': ''
+'Toggle the menu': 'Växla menyn'
-'Open the documentation': ''
+'Open the documentation': 'Öppna dokumentationen'
-'Ask the developer': ''
+'Ask the developer': 'Fråga utvecklaren'
-'New request': ''
+'New request': 'Ny förfrågan'
-'Report a bug': ''
+'Report a bug': 'Rapportera ett fel'
-'Show the configuration': ''
+'Show the configuration': 'Visa konfigurationen'
-'Configuration:': ''
+'Configuration:': 'Konfiguration:'
-'Done!': ''
+'Done!': 'Klar!'
-'Copy': ''
+'Copy': 'Kopiera'
-'Need help': ''
+'Need help': 'Behöver hjälp'
-'I would like a new feature': ''
+'I would like a new feature': 'Jag skulle vilja ha en ny funktion'
-'Something went wrong': ''
+'Something went wrong': 'Något gick fel'
-'Select apps': ''
+'Select apps': 'Välj appar'
-'Sort': ''
+'Sort': 'Sortera'
-'Customize': ''
+'Customize': 'Anpassa'
-'Custom': ''
+'Custom': 'Anpassad'
-'Close': ''
+'Close': 'Stäng'

src/l10n/fixtures/zh_CN.yaml

@@ -38,7 +38,7 @@
 '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)': '‌当鼠标悬停在触发器上时打开菜单（在触摸屏上自动禁用）'
+'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': '图标和文本'

src/menu.js

@@ -17,6 +17,8 @@
 
 import './scss/menu.scss'
 
+import '@formatjs/intl-segmenter/polyfill.js'
+
 import { createApp } from 'vue'
 import { createPinia } from 'pinia'
 import { createElement, waitContainer } from './lib/dom.js'

src/menus/StandardMenu.vue

@@ -62,8 +62,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
       </li>
     </ul>
     <NcActions
-      class="cm-standardmenu-app-menu-more app-menu-more"
+      class="cm-standardmenu-app-menu-more"
       :aria-label="t('core', 'More apps')"
+      :forceMenu="true"
     >
       <NcActionLink
         v-for="app in popoverAppList"
@@ -132,19 +133,27 @@ const setApps = (value) => {
 const appLimit = () => {
   const headerStart = document.querySelector('#header .header-start')
   const headerEnd = document.querySelector('#header .header-end')
+  const unifiedSearch = document.querySelector('#header .unified-search-input')
   const body = document.querySelector('body')
 
-  let size = (headerEnd ? headerEnd.offsetWidth : 0) + 70
+  let totalWidth = body.offsetWidth
+  let otherElementsWidth = headerEnd ? headerEnd.offsetWidth : 0
+
+  if (unifiedSearch && headerEnd.offsetWidth < unifiedSearch.offsetWidth) {
+    otherElementsWidth += unifiedSearch.offsetWidth
+  }
+
+  let maxWidth = body.offsetWidth - otherElementsWidth
 
   if (headerStart) {
     Array.from(headerStart.children).forEach((child) => {
       if (child.id !== 'app-menu-container') {
-        size += child.offsetWidth
+        maxWidth -= child.offsetWidth
       }
     })
   }
 
-  return Math.max(0, Math.floor((body.offsetWidth - size) / 70))
+  return Math.max(0, Math.floor(maxWidth / 60))
 }
 
 const makeStyle = (app) => {
@@ -156,13 +165,9 @@ const makeStyle = (app) => {
 }
 
 const computeLists = () => {
-  mainAppList.value = appList.value.slice(0, appLimit())
+  const limit = appLimit()
-  popoverAppList.value = appList.value.slice(appLimit()).sort((a, b) => a.order - b.order)
+  mainAppList.value = appList.value.slice(0, limit)
-}
+  popoverAppList.value = appList.value.slice(limit).sort((a, b) => a.order - b.order)
-
-const reComputeLists = (delay) => {
-    window.clearTimeout(resizeTimeout)
-    resizeTimeout = window.setTimeout(computeLists, delay || 100)
 }
 
 onMounted(async () => {
@@ -177,7 +182,7 @@ onMounted(async () => {
 
   setApps(await navStore.getCoreApps())
 
-  window.addEventListener('resize', reComputeLists)
+  window.setInterval(computeLists, 100)
 })
 </script>
 

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 {

src/scss/menu.scss

@@ -363,6 +363,16 @@
     right: 0 !important;
     margin-left: 0 !important;
   }
+
+  #content {
+    left: 53px;
+    width: calc(100% - (var(--body-container-margin) * 2) - 62px);
+  }
+
+  #content-vue {
+    width: calc(100% - (var(--body-container-margin) * 2) - 60px);
+    margin-left: 11px;
+  }
 }
 
 @media screen and (max-width: 1024px) {
@@ -385,6 +395,16 @@
       padding: 10px 0;
     }
   }
+
+  #header {
+    .unified-search-input {
+      width: 80px !important;
+
+      .unified-search-input__label {
+        display: none;
+      }
+    }
+  }
 }
 
 @media screen and (min-width: 1024px) {
@@ -599,3 +619,9 @@ $header-icon-size: 20px;
     display: none;
   }
 }
+
+#header {
+  .unified-search-input:not(.unified-search-input--mobile) {
+    position: unset !important;
+  }
+}

src/user.js

@@ -17,6 +17,8 @@
 
 import './scss/admin.scss'
 
+import '@formatjs/intl-segmenter/polyfill.js'
+
 import { createApp } from 'vue'
 import { createPinia } from 'pinia'
 import { waitContainer } from './lib/dom.js'

templates/css/stylesheet.php

@@ -38,7 +38,7 @@ body[data-theme-light], body[data-theme-light-highcontrast] {
 
 <?php if ($_['opener-only']) { ?>
   #nextcloud {
-    display: none;
+    display: none !important;
   }
 <?php } ?>
 
@@ -117,15 +117,3 @@ body[data-theme-light], body[data-theme-light-highcontrast] {
     font-size: 16px;
   }
 <?php } ?>
-
-<?php if ($_['always-displayed']) { ?>
-  #content {
-    left: 53px;
-    width: calc(100% - (var(--body-container-margin) * 2) - 62px);
-  }
-
-  #content-vue {
-    width: calc(100% - (var(--body-container-margin) * 2) - 60px);
-    margin-left: 11px;
-  }
-<?php } ?>

webpack.config.js

@@ -7,6 +7,7 @@ const NodePolyfillPlugin = require('node-polyfill-webpack-plugin')
 const TerserPlugin = require('terser-webpack-plugin')
 
 const appName = 'side_menu'
+const appVersion = '6.x'
 const buildMode = process.env.NODE_ENV
 const isDev = buildMode === 'development'
 
@@ -80,6 +81,7 @@ module.exports = {
 
     new webpack.DefinePlugin({
       appName: JSON.stringify(appName),
+      appVersion: JSON.stringify(appVersion),
     }),
   ],