Merge branch 'develop'

CHANGELOG.md

@@ -1,132 +1,179 @@
+## v1.25.1
+### Added
+- add PHP version as dependency
+- add chinese translation
+### Fixed
+- fix CHANGELOG
+
 ## v1.25.0
+### Added
 - add compatibility with Nextcloud 22
 - add CHANGELOG.md (fix #59)
 - update app icon
 
 ## v1.24.0
+### Added
 - add option to define the background opacity (fix #53)
 - add missing translations
 
 ## v1.23.1
+### Fixed
 - fix but wih dark mode opener option
 
 ## v1.23.0
+### Added
 - add support of dark Theme and Breeze Dark
 - add support of Nextcloud 21
 
 ## v1.22.2
+### Fixed
 - fix regression: apps does not open in new tab (fix #55)
 
 ## v1.22.1
+### Fixed
 - fix regression: apps does not open in new tab
 
 ## v1.22.0
+### Added
 - Add option to sort categories (fix #53)
 - Update admin UI
 
 ## v1.21.0
+### Added
 - [FEATURE] Logo in the menu links to main page of installation (#51)
 
 ## v1.20.1
+### Fixed
 - Fix translations
 
 ## v1.20.0
+### Added
 - [FEATURE] Ability to remove apps from the Big Menu (#49)
 
 ## v1.19.1
+### Fixed
 - fix #47: setting for list/grid view in files app flashes and dissapears
 
 ## v1.19.0
+### Added
 - add option: the menu is enabled by default for users (fix #46)
 
 ## v1.18.0
+### Added
 - add option to show link to settings (fix #44)
 - refactor menus using several components
 
 ## v1.17.0
+### Added
 - compliance with the app checker
 - add an action to export the configuration
 - add an action to purge the cache
 
 ## v1.16.3
+### Fixed
 - fix links that must be opened in new window (https://help.nextcloud.com/t/external-petit-probleme-concernant-lapplication-external-sites-ou-sites-externes/94884/11)
 
 ## v1.16.2
+### Fixed
 - fix issue with personal settings when global settings are forced
 
 ## v1.16.1
+### Fixed
 - fix #42: add cache to manage failures to access apps.nextcloud.com
 - fix #41: side menu was hover apps list
 
 ## v1.16.0
+### Added
 - add an option to force settings to users (fix #38)
 
 ## v1.15.0
+### Changed
 - New name
+### Fixed
 - Fix #36: always displayed is not expanding
 
 ## v1.14.0
+### Added
 - add an api accessed by components
 - add a config proxy in controllers
+### Fixed
 - fix translations
 
 ## v1.13.0
+### Added
 - add an option to display the avatar instead of the logo (fix #34)
 
 ## v1.12.3
+### Added
 - add a delay before moving elements (fix #33)
 
 ## v1.12.2
+### Fixed
 - fix #30: `Always displayed` menu can not be close using touchscreens
 
 ## v1.12.1
+### Fixed
 - fix typo
 - fix translations
 
 ## v1.12.0
+### Fixed
 - fix #30: administrators and users can select what apps must be opened in new tab
 - fix typo
 
 ## v1.11.0
+### Added
 - add the option for opening apps in new tab (fix #29)
+### Fixed
 - fix issue with the header of the always displayed menu
 
 ## v1.10.0
+### Added
 - add images to select the display of the menu
 - add live preview
 - update translations
 - update app info
 
 ## v1.9.3
+### Fixed
 - fix regression with logo display
 
 ## v1.9.2
+### Added
 - add the option “always displayed” which fixes the position of the menu to the left and always displays the application icons (fix #21, fix #2)
 
 ## v1.8.6
+### Added
 - add translations: `fr` and `de`
 - improve and publish the `Makefile`
 - update documentation
 
 ## v1.8.5
+### Fixed
 - fix #28: menu items invisible after 1.8.4
 
 ## v1.8.4
+### Fixed
 - fix #27: disable side menu on public pages - broken in 1.8.3
 
 ## v1.8.3
+### Fixed
 - fix alphabetic order of apps (#26)
 
 ## v1.8.2
+### Added
 - add icon for closing the big menu (fix #25)
+### Fixed
 - fix hidden icons in the top menu (fix #23)
 - fix missing apps (fix #24)
 
 ## v1.8.1
+### Fixed
 - fix issue with links
 - fix missing l10n files
 
 ## v1.8.0
+### Added
 - add a `big menu` display (fix #22)
 - add the possibility to choose what apps are displayed in the top menu (fix #22)
 - add icon color filter
@@ -135,56 +182,74 @@
 ## v1.8.0-rc2
 
 ## v1.7.0
+### Added
 - add a loader when the page is unloading
 - add compatibility with Nextcloud 19
 
 ## v1.6.3
+### Fixed
 - fix #20: add a shortcut to open and to hide the menu
 
 ## v1.6.2
+### Fixed
 - fix #19: add a cache to limit flashes
 
 ## v1.6.1
+### Fixed
 - fix #19: add a hack to show external sites in the top menu with navigation
 
 ## v1.6.0
-- Refactoring of javascripts
+### Added
 - Add a page of personal settings
 - Add an option to disable the side menu as user
+- Refactoring of javascripts
 
 ## v1.5.0
+### Added
+- add option to force light icons instead of dark icons
+### Fixed
 - fix #19: add option to keep external sites in the top menu
 - fix #16 #17: add dark icons and handle the svg filters
-- add option to force light icons instead of dark icons
 
 ## v1.4.1
+### Added
+- Rendering  harmonization with browsers
+### Fixed
 - FIX #15: make menu start after icon
-- Rendering  harmonization  with browsers
 
 ## v1.4.0
+### Fixed
 - Fix #12: add an option to hide the opener and the panel when there is no application
 
 ## v1.3.4
+### Fixed
 - FIX #14: add option to show only the opener
 - FIX #13: add alternate hamburger icon
 - FIX #11: remove error in the console
 
 ## v1.3.3
-- FIX #10: add options to select the size of the icons and the text, or hide them
+### Added
 - Add a second background color to create a background gradiant
 - Update documentation
+### Fixed
+- FIX #10: add options to select the size of the icons and the text, or hide them
 
 ## v1.3.2
+### Fixed
 - FIX #9: opener icon not visible with multiple apps_paths
 
 ## v1.3.1
+### Fixed
 - FIX #3: Add an opition the choose the position of the opener (after or before the logo)
 - FIX #8: Remove extension of dynamic asset's routes (js, css)
 
 ## v1.3.0
--  FIX #2: add option to open the menu by hovering over opener
+### Added
 - `main.js` is replaced by a controller and a template
+### Fixed
+-  FIX #2: add option to open the menu by hovering over opener
 
 ## v1.2.4
+### Fixed
 - FIX #7: Opener icon not visible in Safari
 

appinfo/info.xml

@@ -26,7 +26,7 @@ If you like this application and if you want to support the development:
 * [Donate with liberapay](https://liberapay.com/deblan)
 * [Leave a comment](https://apps.nextcloud.com/apps/side_menu#comments)
 ]]></description>
-    <version>1.25.0</version>
+    <version>1.25.1</version>
     <licence>agpl</licence>
     <author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
     <namespace>SideMenu</namespace>
@@ -47,6 +47,7 @@ If you like this application and if you want to support the development:
     <screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/personal_settings.png</screenshot>
     <dependencies>
         <nextcloud min-version="18" max-version="22"/>
+        <php min-version="7.3"/>
     </dependencies>
     <settings>
         <admin>OCA\SideMenu\Settings\Admin</admin>

src/l10n/fixtures/zh_CN.yaml

@@ -0,0 +1,78 @@
+"Custom menu": "自定义菜单"
+"Enable the custom menu": "激活自定义菜单"
+"No": "取消"
+"Yes": "确定"
+"Menu": "菜单"
+"Use the shortcut <span class=\"keyboard-key\">Ctrl<\/span>+<span class=\"keyboard-key\">o<\/span> to open and to hide the side menu. Use <span class=\"keyboard-key\">tab<\/span> to navigate.": "使用快捷键 <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.": "如不选择，将应用全局设定。"
+"Experimental": "实验性"
+"Save": "保存"
+"You like this app and you want to support me?": "喜欢本应用并支持我一下？"
+"Buy me a coffee ☕": "赏一杯咖啡 ☕ 给我"
+"Hidden": "隐藏"
+"Small": "小型"
+"Normal": "标准"
+"Big": "大型"
+"Colors": "颜色"
+"Background color": "背景颜色"
+"Background color of current app": "当前应用的背景色"
+"Text color": "文字颜色"
+"Loader": "菜单指示器"
+"Icon": "图标"
+"Same color": "相同颜色"
+"Opposite color": "相反颜色"
+"Transparent": "透明"
+"Opaque": "不透明"
+"Opener": "容器"
+"Default": "默认"
+"Default (dark)": "默认(深色)"
+"Hamburger": "Hamburger"
+"Hamburger (dark)": "Hamburger (深色)"
+"Hamburger 2": "Hamburger 2"
+"Hamburger 2 (dark)": "Hamburger 2 (深色)"
+"Before the logo": "在logo前"
+"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如果没有应用，不显示侧边栏菜单和容器 (例如 : 公共页面)。"
+"Panel": "面板"
+"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "鼠标悬停时打开菜单 (触摸屏时将自动禁用)"
+"Display the big menu": "显示大型菜单"
+"The big menu is not compatible with AppOrder.": "大型菜单与应用顺序不兼容"
+"Display the logo": "显示logo"
+"This feature is not compatible with the <code>big menu<\/code> display.": "此功能与显示<code>大型菜单<\/code>不兼容。"
+"Icons and texts": "图标与文字"
+"Loader enabled": "菜单指示器已激活"
+"Tips": "技巧"
+"Always displayed": "一直显示"
+"The logo will be hidden when the menu is always displayed.": "一直显示菜单时logo将被隐藏。"
+"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": "使用头像代替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.": "此功能只和<code>大型菜单<\/code>兼容。"
+"The logo is a link to the default app": "logo链接到默认应用"
+"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": "暗黑模式颜色"