From 572f05ed5201f6b3ccc6a7c7cc1e7ea82d839a64 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Sat, 5 Nov 2022 10:49:50 +0000 Subject: [PATCH 1/7] Translated using Weblate (Czech) Currently translated at 100.0% (91 of 91 strings) Translation: Custom menu/Application Translate-URL: https://translate.codeberg.org/projects/custom-menu/application/cs/ --- src/l10n/fixtures/cs.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/l10n/fixtures/cs.yaml b/src/l10n/fixtures/cs.yaml index 0e3f028..08033d0 100644 --- a/src/l10n/fixtures/cs.yaml +++ b/src/l10n/fixtures/cs.yaml @@ -104,5 +104,7 @@ "Big text": "Velký text" "Applications": "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." +"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." -- 2.20.1 From 2b4feb908e17138d799aa94ff06f297d62f79ae0 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Sat, 5 Nov 2022 10:49:51 +0000 Subject: [PATCH 2/7] Translated using Weblate (German) Currently translated at 100.0% (91 of 91 strings) Translation: Custom menu/Application Translate-URL: https://translate.codeberg.org/projects/custom-menu/application/de/ --- src/l10n/fixtures/de.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/l10n/fixtures/de.yaml b/src/l10n/fixtures/de.yaml index d8d9bc1..1b3cb2c 100644 --- a/src/l10n/fixtures/de.yaml +++ b/src/l10n/fixtures/de.yaml @@ -107,5 +107,7 @@ "Big text": "Großer Text" "Applications": "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." +"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." -- 2.20.1 From 5ed9e1e44911953f3091f30ec6aaf9e5b38d60c8 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Sat, 5 Nov 2022 10:49:51 +0000 Subject: [PATCH 3/7] Translated using Weblate (French) Currently translated at 100.0% (91 of 91 strings) Translation: Custom menu/Application Translate-URL: https://translate.codeberg.org/projects/custom-menu/application/fr/ --- src/l10n/fixtures/fr.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/l10n/fixtures/fr.yaml b/src/l10n/fixtures/fr.yaml index e1a535b..13c660f 100644 --- a/src/l10n/fixtures/fr.yaml +++ b/src/l10n/fixtures/fr.yaml @@ -107,5 +107,7 @@ "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 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" +"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" +"These applications must be selected in the previous option.": "Ces applications doivent\ + \ également être sélectionnées dans l'option précédente" -- 2.20.1 From 8bf7c7a8ce47193665b8a4871e52e314301285f4 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Sat, 5 Nov 2022 10:49:52 +0000 Subject: [PATCH 4/7] Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (91 of 91 strings) Translation: Custom menu/Application Translate-URL: https://translate.codeberg.org/projects/custom-menu/application/zh_Hans/ --- src/l10n/fixtures/zh_CN.yaml | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/l10n/fixtures/zh_CN.yaml b/src/l10n/fixtures/zh_CN.yaml index df3b412..6c74d3f 100644 --- a/src/l10n/fixtures/zh_CN.yaml +++ b/src/l10n/fixtures/zh_CN.yaml @@ -3,7 +3,11 @@ "No": "取消" "Yes": "确定" "Menu": "菜单" -"Use the shortcut Ctrl<\/span>+o<\/span> to open and to hide the side menu. Use tab<\/span> to navigate.": "使用快捷键 Ctrl<\/span>+o<\/span> 打开或隐藏侧边栏菜单。使用tab<\/span> 来导航。" +? "Use the shortcut Ctrl+o to open and to hide the side menu. Use tab\ + \ to navigate." +: "使用快捷键 Ctrl+o\ + \ 打开或隐藏侧边栏菜单。使用tab 来导航。" "Top menu": "顶部菜单" "Apps that not must be moved in the side menu": "禁止在侧边栏菜单移动的应用" "If there is no selection then the global configuration is applied.": "如不选择，将应用全局设定。" @@ -36,9 +40,11 @@ "After the logo": "在logo后" "Position": "位置" "Show only the opener (hidden logo)": "只显示容器 (隐藏logo)" -"Do not display the side menu and the opener if there is no application (eg: public pages).": "N如果没有应用，不显示侧边栏菜单和容器 (例如 : 公共页面)。" +"Do not display the side menu and the opener if there is no application (eg: public pages).": "N如果没有应用，不显示侧边栏菜单和容器\ + \ (例如 : 公共页面)。" "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": "显示logo" "Icons and texts": "图标与文字" @@ -62,7 +68,7 @@ "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 big menu<\/code> display.": "此功能只和大型菜单<\/code>兼容。" +"This feature is only compatible with the big menu display.": "此功能只和大型菜单兼容。" "The logo is a link to the default app": "logo链接到默认应用" "Others": "其他" "Categories": "类别" @@ -87,5 +93,7 @@ "Big text": "大文本" "Applications": "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." +"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." -- 2.20.1 From 3c7cd2812f973eb9f2a133cfc2b8398d7e23259e Mon Sep 17 00:00:00 2001 From: deblan Date: Sat, 5 Nov 2022 10:56:27 +0000 Subject: [PATCH 5/7] Translated using Weblate (French) Currently translated at 100.0% (91 of 91 strings) Translation: Custom menu/Application Translate-URL: https://translate.codeberg.org/projects/custom-menu/application/fr/ --- src/l10n/fixtures/fr.yaml | 55 ++++++++++++--------------------------- 1 file changed, 17 insertions(+), 38 deletions(-) diff --git a/src/l10n/fixtures/fr.yaml b/src/l10n/fixtures/fr.yaml index 13c660f..7af0b34 100644 --- a/src/l10n/fixtures/fr.yaml +++ b/src/l10n/fixtures/fr.yaml @@ -3,21 +3,14 @@ "No": "Non" "Yes": "Oui" "Menu": "Menu" -? 'Use the shortcut Ctrl+o - to open and to hide the side menu. Use tab to - navigate.' -: 'Utiliser le raccourcis clavier Ctrl+o - pour ouvrir et fermer le menu latéral. Utiliser tab - pour naviguer.' +? 'Use the shortcut Ctrl+o to open and to hide the side menu. Use tab to navigate.' +: 'Utiliser le raccourcis clavier Ctrl+o pour ouvrir et fermer le menu latéral. Utiliser tab pour naviguer.' "Top menu": "Menu supérieur" -"Apps that not must be moved in the side menu": "Les applications qui ne doivent pas\ - \ ê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." +"Apps that not must be moved in the side menu": "Les applications qui ne doivent pas ê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." "Experimental": "Expérimental" "Save": "Sauvegarder" -"You like this app and you want to support me?": "Vous aimer cette application et\ - \ vous souhaitez m'aider ?" +"You like this app and you want to support me?": "Vous aimer cette application et vous souhaitez m'aider ?" "Buy me a coffee ☕": "Offrez moi un café ☕" "Hidden": "Caché" "Small": "Petit" @@ -51,22 +44,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\ - \ 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)." +"Show only the opener (hidden logo)": "Afficher uniquement le bouton d'ouverture (masquer 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)." "Panel": "Panneau" -"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)" +"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)" "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\ - \ automatique lorsque le menu est toujours affiché." +"This is the automatic behavior when the menu is always displayed.": "C'est le comportement 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" @@ -75,21 +63,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\ - \ de changer les paramètres." +"You do not have permission to change the settings.": "Vous n'avez pas la permission 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\ - \ utilisateurs" +"The menu is enabled by default for users": "Le menu est activé par défaut pour les 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\ - \ être affichées dans le menu" -"This feature is only compatible with the big menu display.": "Compatible\ - \ avec l'affichage Menu large." -"The logo is a link to the default app": "Le logo est un lien vers l'application par\ - \ défaut" +"Apps that should not be displayed in the menu": "Applications qui ne doivent pas être affichées dans le menu" +"This feature is only compatible with the big menu display.": "Compatible avec l'affichage Menu large." +"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" @@ -97,9 +80,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\ - \ paramètres sont utilisés lorsque le thème sombre ou le thème Breeze Dark sont\ - \ activés." +"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." "Dark mode colors": "Couleurs du mode sombre" "With categories": "Avec les catégories" "Custom categories": "Catégories personnalisées" @@ -107,7 +88,5 @@ "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\ - \ 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" +"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" +"These applications must be selected in the previous option.": "Ces applications doivent également être sélectionnées dans l'option précédente." -- 2.20.1 From 0ac55b7ba444457cf86a99ff21937fa7c879d803 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sat, 5 Nov 2022 15:40:52 +0100 Subject: [PATCH 6/7] fix #162: top and side app is broken --- lib/Controller/NavController.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Controller/NavController.php b/lib/Controller/NavController.php index a461ce3..50efc4c 100644 --- a/lib/Controller/NavController.php +++ b/lib/Controller/NavController.php @@ -113,11 +113,11 @@ class NavController extends Controller } foreach ($apps as $app) { - if (in_array($app['id'], $topMenuApps) && !in_array($app['id'], $userTopSideMenuApps)) { - continue; - } + $inTopMenuApps = in_array($app['id'], $topMenuApps); + $inTopSideMenuApps = in_array($app['id'], $topSideMenuApps); + $inHiddenApps = in_array($app['id'], $hiddenApps); - if (in_array($app['id'], $hiddenApps)) { + if (($inTopMenuApps && !$inTopSideMenuApps) || $inHiddenApps) { continue; } -- 2.20.1 From 00e8a56e1557855bccf58d14d9b4a007109754ca Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sun, 6 Nov 2022 16:55:23 +0100 Subject: [PATCH 7/7] release v3.3.1 --- CHANGELOG.md | 4 ++++ appinfo/info.xml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ae81a08..7afbc5f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## [Unreleased] +## 3.3.1 +### Fixed +* fix #162: top and side apps does work correctly + ## 3.3.0 ### Added * add documentation in admin page diff --git a/appinfo/info.xml b/appinfo/info.xml index b78caea..d8a06b8 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -32,7 +32,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/). ]]> - 3.3.0 + 3.3.1 agpl Simon Vieille SideMenu -- 2.20.1