Merge pull request 'v2.4.3' (#115) from develop into master

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

.drone.yml

@@ -1,54 +0,0 @@
----
-kind: pipeline
-type: docker
-name: default
-
-steps:
-  - name: dependencies
-    image: deblan/devenv
-    commands:
-      - npm install
-
-  - name: build
-    image: deblan/devenv
-    commands:
-      - make npm-build
-    when:
-      branch:
-        exclude:
-          - master
-        include:
-          - develop
-          - feature/*
-      event:
-        - push
-        - pull_request
-
-  - name: release
-    image: deblan/devenv
-    volumes:
-      - name: artifacts
-        path: /artifacts
-    environment:
-      APP_CERTIFICATE:
-        from_secret: app_certificate
-    commands:
-      - mkdir -p "$HOME/.nextcloud/certificates"
-      - echo "$APP_CERTIFICATE" > "$HOME/.nextcloud/certificates/side_menu.key"
-      - export VERSION=$(grep "<version>" appinfo/info.xml | grep -o "[0-9]*\.[0-9]*\.[0-9]*" --color=never)
-      - export RELEASE_DIRECTORY="/artifacts/deblan/side_menu"
-      - make release
-    when:
-      branch:
-        exclude:
-          - develop
-          - feature/*
-        include:
-          - master
-      event:
-        - push
-
-volumes:
-  - name: artifacts
-    host:
-      path: /var/www/html/artifacts

.woodpecker.yml

@@ -0,0 +1,42 @@
+pipeline:
+  dependencies:
+    image: deblan/devenv
+    commands:
+      - npm install
+    when:
+      event: [tag, push, pull_request]
+      branch: [master, develop, feature/*]
+
+  build:
+    image: deblan/devenv
+    commands:
+      - make npm-build
+    when:
+      event: [push, pull_request]
+
+  package:
+    image: deblan/devenv
+    volumes:
+      - /var/www/html/artifacts:/var/www/html/artifacts
+    secrets: [app_certificate]
+    commands:
+      - mkdir -p "$HOME/.nextcloud/certificates"
+      - echo "$APP_CERTIFICATE" > "$HOME/.nextcloud/certificates/side_menu.key"
+      - export VERSION=$(grep "<version>" appinfo/info.xml | grep -o "[0-9]*\.[0-9]*\.[0-9]*" --color=never)
+      - export RELEASE_DIRECTORY="/var/www/html/artifacts/deblan/side_menu"
+      - make release
+    when:
+      event: [tag]
+
+  release:
+    image: plugins/gitea-release
+    volumes:
+      - /var/www/html/artifacts:/var/www/html/artifacts
+    settings:
+      api_key:
+        from_secret: gitnet_api_key
+      base_url: https://gitnet.fr
+      note: ${CI_COMMIT_MESSAGE}
+      files: /var/www/html/artifacts/deblan/side_menu/${CI_COMMIT_TAG/v//}/*
+    when:
+      event: [tag]

CHANGELOG.md

@@ -1,5 +1,19 @@
 ## [Unreleased]
 
+## 2.4.3
+### Fixed
+* fix translations
+
+## 2.4.2
+### Fixed
+* fix typo
+### Changed
+* change ci/cd
+
+## 2.4.1
+### Fixed
+* fix user setting save
+
 ## 2.4.0
 ### Added
 * remove focus on opener after click

README.md

@@ -15,12 +15,12 @@ You can customize colors depending of the theme (Dark theme and Breeze Dark). Co
 
 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)
 
-[![Build Status](https://ci2.gitnet.fr/api/badges/deblan/side_menu/status.svg)](https://ci2.gitnet.fr/deblan/side_menu)
+[![Build Status](https://ci.gitnet.fr/api/badges/deblan/side_menu/status.svg)](https://ci.gitnet.fr/deblan/side_menu)
 
 Requirements
 ------------
 
-* PHP >= 7.3
+* PHP >= 7.4
 * App `theming` enabled
 
 Installation and upgrade

appinfo/info.xml

@@ -17,7 +17,7 @@ You can report a bug or request a feature by opening an issue.
 
 Requirements:
 
-* PHP >= 7.3
+* PHP >= 7.4
 * App `theming` enabled
 
 If you like this application and if you want to support the development:
@@ -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>2.4.0</version>
+    <version>2.4.3</version>
     <licence>agpl</licence>
     <author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
     <namespace>SideMenu</namespace>

src/l10n/fixtures/cs.yaml

@@ -3,8 +3,8 @@
 "No": "Ne"
 "Yes": "Ano"
 "Menu": "Nabídka"
-'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.': 'Pro otevření/skrytí postranní nabídky použijte zkratku <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span>. Pro pohyb po použijte klávesu <span class="keyboard-key">tab</span>.'
+'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.': 'Pro otevření/skrytí postranní nabídky použijte zkratku <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">O</span> („O“ jako otevřít). Pro pohyb po použijte klávesu <span class="keyboard-key">Tab</span>.'
-"Top menu": "Hlavní nabídka"
+"Top menu": "Horní nabídka"
 "Apps that not must be moved in the side menu": "Aplikace, které nepřesouvat do postranní nabídky"
 "If there is no selection then the global configuration is applied.": "Pokud neexistuje žádný výběr, je uplatněno globální nastavení."
 "Experimental": "Experimentální"
@@ -62,7 +62,7 @@
 "Export the configuration": "Exportovat nastavení"
 "Purge the cache": "Vyprázdnit mezipaměť"
 "Show the link to settings": "Zobrazit odkaz na nastavení"
-"The menu is enabled by default for users": "Nabídka je ve výchozím stavu zapnutá pro uživatele"
+"The menu is enabled by default for users": "Nabídka je ve výchozím stavu pro uživatele zapnutá"
 "Except when the configuration is forced.": "S výjimkou, kdy je nastavení vynuceno."
 "Apps that should not be displayed in the menu": "Aplikace, které by neměly být v nabídce zobrazeny"
 "This feature is only compatible with the <code>big menu</code> display.": "Tato funkce je kompatibilní pouze s <code>velkou nabídkou</ code>."
@@ -78,7 +78,6 @@
 "Dark mode colors": "Barvy tmavého režimu"
 "With categories": "S kategoriemi"
 "Custom categories": "Vlastní kategorie"
-"Customize application categories": "Personnaliser les catégories des applications"
 "Customize application categories": "Přizpůsobte kategorie aplikací"
 "Apps only visible in the top menu": "Aplikace jsou viditelné pouze v horní nabídce "
 "Apps visible in the top and side menus": "Aplikace viditelné v horní a boční nabídce"

templates/settings/admin-form.php

@@ -880,7 +880,7 @@ $choicesSizes = [
                     <a class="side-menu-toggler" data-target="#apps-categories-custom-list" href="#_">
                         🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
                     </a>
--to
+
                     <div id="apps-categories-custom-list" style="display: none">
                         <ul class="side-menu-setting-list">
                             <?php foreach ($_['apps'] as $app): ?>

templates/settings/personal-form.php

@@ -202,7 +202,10 @@ $choicesYesNo = [
 
     <div class="section">
         <?php if (!$_['force']): ?>
-            <button id="side-menu-save" class="btn btn-primary"><?php p($l->t('Save')); ?></button>
+            <button id="side-menu-save" class="btn btn-info">
+                <?php p($l->t('Save')); ?>
+                <progress max="100" value="0" id="side-menu-save-progress"></progress>
+            </button>
 
             <span id="side-menu-message" class="msg"></span>