Merge pull request 'release v3.7.0' (#227) from develop into master

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

.gitea/issue_template/ISSUE_TEMPLATE.yml

@@ -26,7 +26,7 @@ body:
     id: configuration
     attributes:
       label: Configuration
-      description: Export the configuration using the admin page and copy/paste here.
+      description: Export the configuration using the admin page and copy/paste here ([documentation](https://deblan.gitnet.page/side_menu_doc/tips/#export-the-configuration)).
       value: |
         ```
         {

CHANGELOG.md

@@ -1,5 +1,14 @@
 ## [Unreleased]
 
+## 3.7.0
+### Added
+* add translations (thanks to AHOHNMYC)
+* add compatibility with NC26
+
+## 3.6.0
+### Added
+* add hidden apps compatible with default menu (#219)
+
 ## 3.5.2
 ### Fixed
 * add check if menu exists before adding event listeners (#210)

README.md

@@ -18,6 +18,8 @@ You can customize colors depending of the theme (Dark theme and Breeze Dark).
 
 You like this app and you want to support me? ☕ [Buy me a coffee](https://www.buymeacoffee.com/deblan) or [Donate with liberapay](https://liberapay.com/deblan)
 
+## [📘 Read the documentation](https://deblan.gitnet.page/side_menu_doc/)
+
 Requirements
 ------------
 

appinfo/info.xml

@@ -32,12 +32,12 @@ 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>3.5.2</version>
+    <version>3.7.0</version>
     <licence>agpl</licence>
     <author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
     <namespace>SideMenu</namespace>
     <documentation>
-        <admin>https://gitnet.fr/deblan/side_menu/src/branch/master/README.md</admin>
+        <admin>https://deblan.gitnet.page/side_menu_doc/</admin>
         <developer>https://gitnet.fr/deblan/side_menu/src/branch/master/README.md</developer>
     </documentation>
     <category>customization</category>
@@ -54,7 +54,7 @@ In case of downtime, you can download **Custom Menu** from [here](https://kim.de
     <screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc25_big_menu.png</screenshot>
     <screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc25_default_menu.png</screenshot>
     <dependencies>
-        <nextcloud min-version="25" max-version="25"/>
+        <nextcloud min-version="25" max-version="26"/>
         <php min-version="7.4"/>
     </dependencies>
     <settings>

src/SideMenu.vue

@@ -41,6 +41,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
     <ul class="side-menu-apps-list">
       <SideMenuApp
         v-for="(app, key) in apps"
+        v-if="!hiddenApps.includes(app.id)"
         v-bind:classes="{'side-menu-app': true, 'active': app.active}"
         v-bind:key="key"
         v-bind:icon="app.icon"
@@ -76,6 +77,7 @@ export default {
       avatar: null,
       forceLightIcon: false,
       targetBlankApps: [],
+      hiddenApps: [],
       settings: null,
     }
   },
@@ -127,6 +129,7 @@ export default {
           this.logo = config['logo']
           this.logoLink = config['logo-link']
           this.settings = config['settings']
+          this.hiddenApps = config['big-menu-hidden-apps']
         })
     },
   },

src/l10n/fixtures/ru.yaml

@@ -7,7 +7,7 @@
 : 'Используйте сочетание клавиш <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span>, чтобы открыть или скрыть боковое меню. Используйте <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.": "If there is no selection then the global configuration is applied."
+"If there is no selection then the global configuration is applied.": "Если тут ничего не отмечено, применяются глобальные настройки."
 "Experimental": "Экспериментальный"
 "Save": "Сохранить"
 "You like this app and you want to support me?": "Вам нравится приложение или вы хотите поддержать меня?"
@@ -16,11 +16,11 @@
 "Small": "Маленький"
 "Normal": "Средний"
 "Big": "Большой"
-"Hidden icon": "Скрытая иконка"
+"Hidden icon": "Без иконки"
 "Small icon": "Маленькая иконка"
 "Normal icon": "Средняя иконка"
 "Big icon": "Большая иконка"
-"Hidden text": "Скрытый текст"
+"Hidden text": "Без текста"
 "Small text": "Маленький текст"
 "Normal text": "Средний текст"
 "Big text": "Большой текст"
@@ -35,44 +35,44 @@
 "Transparent": "Прозрачный"
 "Opaque": "Непрозрачный"
 "Opener": "Открывалка"
-"Default": "По-умолчанию"
+"Default": "По умолчанию"
-"Default (dark)": "По-умолчанию (тёмный)"
+"Default (dark)": "По умолчанию (тёмный)"
 "Hamburger": "Гамбургер"
 "Hamburger (dark)": "Гамбургер (тёмный)"
 "Hamburger 2": "Гамбургер 2"
 "Hamburger 2 (dark)": "Гамбургер 2 (тёмный)"
 "Before the logo": "Перед логотипом"
 "After the logo": "После логотипа"
-"Position": "Позиция"
+"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": "Панеот"
+"Panel": "Панель"
 "Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "Открывать меню при наведении мыши на экран (автоматически отключается на сенсорных экранах)"
 "Display the big menu": "Отобразить большое меню"
-"Display the logo": "Показать лого"
+"Display the logo": "Показать логотип"
 "Icons and texts": "Иконки и текст"
-"Loader enabled": "Loader enabled"
+"Loader enabled": "Загрузчик включен"
 "Tips": "Советы"
 "Always displayed": "Всегда отображается"
 "This is the automatic behavior when the menu is always displayed.": "This is the automatic behavior when the menu is always displayed."
-"Not compatible with touch screens.": "Не совместимо с сенсорными экранами"
+"Not compatible with touch screens.": "Не совместимо с сенсорными экранами."
 "Big menu": "Большое меню"
 "Live preview": "Live preview"
 "Open apps in new tab": "Открывать приложения в новой вкладке"
-"Use the global setting": "Use the global setting"
+"Use the global setting": "Использовать глобальные настройки"
-"Use my selection": "Use my selection"
+"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.": "У вас нет разрешения изменять настройки"
+"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": "The menu is enabled by default for users"
+"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": "Apps that should not be displayed in the menu"
+"Apps that should not be displayed in the menu": "Ппрограммы, скрытые из меню"
 "This feature is only compatible with the <code>big menu</code> display.": "This feature is only compatible with the <code>big menu</code> display."
-"The logo is a link to the default app": "The logo is a link to the default app"
+"The logo is a link to the default app": "Логотип открывает приложение по умолчанию"
 "Others": "Прочие"
 "Categories": "Категории"
 "Customize sorting": "Настроить сортировку"
@@ -80,14 +80,14 @@
 "Name": "Название"
 "Customed": "Customed"
 "Show and hide the list of categories": "Показать или скрыть список категорий"
-"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."
+"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "Эти настройки используются темами Тёмная и Тёмная Breeze."
 "Dark mode colors": "Цвета тёмной темы"
 "With categories": "С категориями"
-"Custom categories": "Custom categories"
+"Custom categories": "Пользовательские категории"
-"Customize application categories": "Customize application categories"
+"Customize application categories": "Изменить категории приложений"
-"Reset to default": "Сбросить к значениям по-умолчанию"
+"Reset to default": "Сбросить к значениям по умолчанию"
 "Applications": "Приложения"
 "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"
 "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": "Скрыть название при наведении мыши"

templates/settings/admin-form.php

@@ -41,6 +41,7 @@ $choicesSizes = [
 
 $labelShowHideApps = 'Show and hide the list of applications';
 $labelReset = 'Reset to default';
+$labelDefault = 'Default';
 $labelWithCategories = 'With categories';
 $labelBigMenu = 'Big menu';
 $labelAlwaysDisplayed = 'Always displayed';
@@ -64,7 +65,7 @@ $labelAlwaysDisplayed = 'Always displayed';
 
         <div>
             <label>
-                <?php p($l->t('Default')); ?>
+                <?php p($l->t($labelDefault)); ?>
             </label>
         </div>
         <p>
@@ -73,7 +74,7 @@ $labelAlwaysDisplayed = 'Always displayed';
                 data-alwaysdiplayed="0"
                 data-bigmenu="0"
                 data-sidewithcategories="0"
-                src="<?php print_unescaped(image_path('side_menu', 'admin/layout-default.svg')); ?>" alt="<?php p($l->t('Default')); ?>">
+                src="<?php print_unescaped(image_path('side_menu', 'admin/layout-default.svg')); ?>" alt="<?php p($l->t($labelDefault)); ?>">
         </p>
 
         <div>
@@ -150,7 +151,7 @@ $labelAlwaysDisplayed = 'Always displayed';
         </h2>
 
         <div class="badges">
-            <span class="badge badge-1"><?php p($l->t('Default')); ?></span>
+            <span class="badge badge-1"><?php p($l->t($labelDefault)); ?></span>
             <span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
             <span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
             <span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>
@@ -312,7 +313,7 @@ $labelAlwaysDisplayed = 'Always displayed';
         <div class="side-menu-setting-table">
             <?php
                 $choices = [
-                    'Default' => 'side-menu-opener',
+                    $labelDefault => 'side-menu-opener',
                     'Default (dark)' => 'side-menu-opener-dark',
                     'Hamburger' => 'side-menu-opener-hamburger',
                     'Hamburger (dark)' => 'side-menu-opener-hamburger-dark',
@@ -341,7 +342,7 @@ $labelAlwaysDisplayed = 'Always displayed';
         </h2>
 
         <div class="badges">
-            <span class="badge badge-1"><?php p($l->t('Default')); ?></span>
+            <span class="badge badge-1"><?php p($l->t($labelDefault)); ?></span>
             <span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
             <span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
             <span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>
@@ -505,7 +506,7 @@ $labelAlwaysDisplayed = 'Always displayed';
         <div class="side-menu-setting-table">
             <?php
                 $choices = [
-                    'Default' => 'side-menu-opener',
+                    $labelDefault => 'side-menu-opener',
                     'Default (dark)' => 'side-menu-opener-dark',
                     'Hamburger' => 'side-menu-opener-hamburger',
                     'Hamburger (dark)' => 'side-menu-opener-hamburger-dark',
@@ -536,7 +537,7 @@ $labelAlwaysDisplayed = 'Always displayed';
         </h2>
 
         <div class="badges">
-            <span class="badge badge-1"><?php p($l->t('Default')); ?></span>
+            <span class="badge badge-1"><?php p($l->t($labelDefault)); ?></span>
             <span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
             <span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
             <span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>
@@ -621,7 +622,7 @@ $labelAlwaysDisplayed = 'Always displayed';
                     <?php p($l->t('Display the logo')); ?>
 
                     <div class="badges">
-                        <span class="badge badge-1"><?php p($l->t('Default')); ?></span>
+                        <span class="badge badge-1"><?php p($l->t($labelDefault)); ?></span>
                     </div>
                 </div>
                 <div class="side-menu-setting-form">
@@ -640,7 +641,7 @@ $labelAlwaysDisplayed = 'Always displayed';
                     <?php p($l->t('Use the avatar instead of the logo')); ?>
 
                     <div class="badges">
-                        <span class="badge badge-1"><?php p($l->t('Default')); ?></span>
+                        <span class="badge badge-1"><?php p($l->t($labelDefault)); ?></span>
                     </div>
                 </div>
                 <div class="side-menu-setting-form">
@@ -659,7 +660,7 @@ $labelAlwaysDisplayed = 'Always displayed';
                     <?php p($l->t('The logo is a link to the default app')); ?>
 
                     <div class="badges">
-                        <span class="badge badge-1"><?php p($l->t('Default')); ?></span>
+                        <span class="badge badge-1"><?php p($l->t($labelDefault)); ?></span>
                     </div>
                 </div>
                 <div class="side-menu-setting-form">
@@ -678,8 +679,10 @@ $labelAlwaysDisplayed = 'Always displayed';
                     <?php p($l->t('Apps that should not be displayed in the menu')); ?>
 
                     <div class="badges">
+                        <span class="badge badge-1"><?php p($l->t($labelDefault)); ?></span>
                         <span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
                         <span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
+                        <span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>
                     </div>
                 </div>
                 <div class="side-menu-setting-form">
@@ -801,7 +804,7 @@ $labelAlwaysDisplayed = 'Always displayed';
         </h2>
 
         <div class="badges">
-            <span class="badge badge-1"><?php p($l->t('Default')); ?></span>
+            <span class="badge badge-1"><?php p($l->t($labelDefault)); ?></span>
             <span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
             <span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
             <span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>
@@ -894,7 +897,7 @@ $labelAlwaysDisplayed = 'Always displayed';
         </h2>
 
         <div class="badges">
-            <span class="badge badge-1"><?php p($l->t('Default')); ?></span>
+            <span class="badge badge-1"><?php p($l->t($labelDefault)); ?></span>
             <span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
             <span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
             <span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>
@@ -1056,7 +1059,7 @@ $labelAlwaysDisplayed = 'Always displayed';
         </h2>
 
         <div class="badges">
-            <span class="badge badge-1"><?php p($l->t('Default')); ?></span>
+            <span class="badge badge-1"><?php p($l->t($labelDefault)); ?></span>
             <span class="badge badge-2"><?php p($l->t($labelWithCategories)); ?></span>
             <span class="badge badge-3"><?php p($l->t($labelBigMenu)); ?></span>
             <span class="badge badge-4"><?php p($l->t($labelAlwaysDisplayed)); ?></span>