Merge branch 'dev' into refactor/rework-css

2025-01-18 17:15:13 +01:00 · 2024-11-23 11:55:05 +01:00 · 2024-11-23 11:55:05 +01:00 · 6c73e57b23
commit 6c73e57b23
parent f3fe81feea 6d9b3e239a
25 changed files with 85 additions and 83 deletions
--- a/.gitlab/lint.yml
+++ b/.gitlab/lint.yml
@ -87,24 +87,25 @@ sonarcloud-check:
    - sonar-scanner

 # Lang file checking
-lang-check:
-  stage: lint
-  image: alpine:latest
-  tags:
-    - saas-linux-medium-amd64
-  rules:
-    - if: "$CODE_QUALITY_DISABLED"
-      when: never
-    - if: "$CI_COMMIT_TAG || $CI_COMMIT_BRANCH"
-  allow_failure: true
-  before_script:
-    - apk add --no-cache jq bash
-  script:
-    - chmod +x .gitlab/scripts/lang_sort.sh
-    - bash .gitlab/scripts/lang_sort.sh ./app/translations/
-  after_script:
-    - if [ -f .gitlab/scripts/lang_sort_log.txt ]; then cat .gitlab/scripts/lang_sort_log.txt; fi
-  artifacts:
-    paths:
-      - .gitlab/scripts/lang_sort_log.txt
-    expire_in: 1 week
+# lang-check:
+#   stage: lint
+#   image: alpine:latest
+#   tags:
+#     - saas-linux-medium-amd64
+#   rules:
+#     - if: "$CODE_QUALITY_DISABLED"
+#       when: never
+#     - if: "$CI_COMMIT_TAG || $CI_COMMIT_BRANCH"
+#   allow_failure: true
+#   before_script:
+#     - apk add --no-cache jq bash
+#   script:
+#     - chmod +x .gitlab/scripts/lang_sort.sh
+#     - bash .gitlab/scripts/lang_sort.sh ./app/translations/
+#   after_script:
+#     - if [ -f .gitlab/scripts/lang_sort_log.txt ]; then cat .gitlab/scripts/lang_sort_log.txt; fi
+#   artifacts:
+#     paths:
+#       - .gitlab/scripts/lang_sort_log.txt
+#     expire_in: 1 week
+# DISABLED - As Weblate managed.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -3,11 +3,12 @@
 ### New features
 TBD
 ### Bug fixes
-TBD
+- Bump requests to resolve yank for CVE-2024-35195 ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/808))
 ### Tweaks
 TBD
 ### Lang
-TBD
+- Weblate Translation Platform Integration
+- Remove incomplete labels from translation files to better support new translation workflow  ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/810))
 <br><br>

 ## --- [4.4.4] - 2024/10/03
--- a/app/translations/cs_CS.json
+++ b/app/translations/cs_CS.json
@ -149,12 +149,12 @@
                "pdf": "PDF",
                "print": "Tisk"
            },
-            "decimal": "",
+            "decimal": ".",
            "emptyTable": "V tabulce nejsou k dispozici žádné údaje",
            "info": "Zobrazeno _START_ až _END_ z _TOTAL_ záznamů",
            "infoEmpty": "Zobrazeno 0 až 0 z 0 záznamů",
            "infoFiltered": "(filtrováno z _MAX_ celkových záznamů)",
-            "infoPostFix": "",
+            "infoPostFix": "|",
            "lengthMenu": "Zobrazit položky _MENU_",
            "loadingRecords": "Načítání...",
            "paginate": {
--- a/app/translations/de_DE.json
+++ b/app/translations/de_DE.json
@ -143,12 +143,12 @@
                "pdf": "PDF",
                "print": "Drucken"
            },
-            "decimal": "",
+            "decimal": ".",
            "emptyTable": "Keine Daten in der Tabelle verfügbar",
            "info": "Zeige _START_ bis _END_ von insges. _TOTAL_ Einträge(n)",
            "infoEmpty": "Zeige 0 bis 0 von insges. 0 Einträgen",
            "infoFiltered": "(gefiltert von _MAX_ maximalen Einträgen)",
-            "infoPostFix": "",
+            "infoPostFix": "|",
            "lengthMenu": "Zeige _MENU_ Einträge",
            "loadingRecords": "Laden...",
            "paginate": {
--- a/app/translations/en_EN.json
+++ b/app/translations/en_EN.json
@ -142,12 +142,12 @@
                "pdf": "PDF",
                "print": "Print"
            },
-            "decimal": "",
+            "decimal": ".",
            "emptyTable": "No data available in table",
            "info": "Showing _START_ to _END_ of _TOTAL_ entries",
            "infoEmpty": "Showing 0 to 0 of 0 entries",
            "infoFiltered": "(filtered from _MAX_ total entries)",
-            "infoPostFix": "",
+            "infoPostFix": "|",
            "lengthMenu": "Show _MENU_ entries",
            "loadingRecords": "Loading...",
            "paginate": {
--- a/app/translations/es_ES.json
+++ b/app/translations/es_ES.json
@ -143,12 +143,12 @@
                "pdf": "PDF",
                "print": "Imprimir"
            },
-            "decimal": "",
+            "decimal": ".",
            "emptyTable": "No hay datos disponibles en la tabla",
            "info": "Mostrando _START_ hasta _END_ de _TOTAL_ entradas",
            "infoEmpty": "Mostrando 0 de 0 entradas",
            "infoFiltered": "(filtrado de _MAX_ entradas totales)",
-            "infoPostFix": "",
+            "infoPostFix": "|",
            "lengthMenu": "Mostrar entradas de _MENU_",
            "loadingRecords": "Cargando...",
            "paginate": {
--- a/app/translations/fi_FI_incomplete.json
+++ b/app/translations/fi_FI_incomplete.json
@ -127,12 +127,12 @@
                "pdf": "PDF",
                "print": "Tulosta"
            },
-            "decimal": "",
+            "decimal": ".",
            "emptyTable": "Tietoja ei löytynyt",
            "info": "Näytetään rivit _START_ - _END_ (yhteensä _TOTAL_ )",
            "infoEmpty": "Näytetään 0 - 0 (yhteensä 0)",
            "infoFiltered": "(suodatettu _MAX_ tuloksen joukosta)",
-            "infoPostFix": "",
+            "infoPostFix": "|",
            "lengthMenu": "Näytä kerralla _MENU_ riviä",
            "loadingRecords": "Ladataan...",
            "paginate": {
--- a/app/translations/fr_FR.json
+++ b/app/translations/fr_FR.json
@ -143,12 +143,12 @@
                "pdf": "PDF",
                "print": "Imprimer"
            },
-            "decimal": "",
+            "decimal": ".",
            "emptyTable": "Aucune donnée disponible dans le table",
            "info": "Affichage de _START_ to _END_ entrées sur _TOTAL_",
            "infoEmpty": "Affichage des entrées 0 à 0 sur 0 entrées",
            "infoFiltered": "(filtré sur un total de _MAX_ entrées)",
-            "infoPostFix": "",
+            "infoPostFix": "|",
            "lengthMenu": "Afficher _MENU_ entrées",
            "loadingRecords": "Chargement ...",
            "paginate": {
--- a/app/translations/fy_NL_incomplete.json
+++ b/app/translations/fy_NL_incomplete.json
@ -126,12 +126,12 @@
                "pdf": "PDF",
                "print": "Ôfdrukke"
            },
-            "decimal": "",
+            "decimal": ".",
            "emptyTable": "Gjin gegevens beskikber yn tabel",
            "info": "Toant _START_ oant _END_ fan _TOTAL_ ynstjoerings",
            "infoEmpty": "Toant 0 oan 0 fan 0 ynstjoerings",
            "infoFiltered": "(filtrearre út _MAX_ totaal ynstjoerings)",
-            "infoPostFix": "",
+            "infoPostFix": "|",
            "lengthMenu": "Lit _MENU_ ynstjoerings sjen",
            "loadingRecords": "Laden...",
            "paginate": {
--- a/app/translations/he_IL.json
+++ b/app/translations/he_IL.json
@ -143,12 +143,12 @@
                "pdf": "PDF",
                "print": "הדפסה"
            },
-            "decimal": "",
+            "decimal": ".",
            "emptyTable": "אין נתונים זמינים בטבלה",
            "info": "רשומות _TOTAL_ מ _END_ עד _START_ מראה",
            "infoEmpty": "מציג 0 עד 0 מתוך 0 ערכים",
            "infoFiltered": "(רשומות _MAX_ מסונן מתוך)",
-            "infoPostFix": "",
+            "infoPostFix": "|",
            "lengthMenu": "רשומות _MENU_ הצגת",
            "loadingRecords": "...טוען",
            "paginate": {
--- a/app/translations/hr_HR_incomplete.json
+++ b/app/translations/hr_HR_incomplete.json
@ -126,12 +126,12 @@
                "pdf": "PDF",
                "print": "Isprintaj"
            },
-            "decimal": "",
+            "decimal": ".",
            "emptyTable": "Nema dostupnih podataka u tablici",
            "info": "Prikazuje se _START_ do _END_ od _TOTAL_ unosa",
            "infoEmpty": "Prikazuje se 0 do 0 od 0 unosa",
            "infoFiltered": "(filtrirano od ukupno _MAX_ unosa)",
-            "infoPostFix": "",
+            "infoPostFix": "|",
            "lengthMenu": "Prikaži _MENU_ unose",
            "loadingRecords": "Učitavanje...",
            "paginate": {
--- a/app/translations/id_ID_incomplete.json
+++ b/app/translations/id_ID_incomplete.json
@ -127,12 +127,12 @@
                "pdf": "PDF",
                "print": "Print"
            },
-            "decimal": "",
+            "decimal": ".",
            "emptyTable": "Tidak Ada Data Yang Ada Di Meja",
            "info": "Showing _START_ to _END_ of _TOTAL_ entries",
            "infoEmpty": "Showing 0 to 0 of 0 entries",
            "infoFiltered": "(filtered from _MAX_ total entries)",
-            "infoPostFix": "",
+            "infoPostFix": "|",
            "lengthMenu": "Show _MENU_ entries",
            "loadingRecords": "Loading...",
            "paginate": {
--- a/app/translations/it_IT.json
+++ b/app/translations/it_IT.json
@ -143,12 +143,12 @@
                "pdf": "PDF",
                "print": "Stampa"
            },
-            "decimal": "",
+            "decimal": ".",
            "emptyTable": "Nessun dato disponibile nella tabella",
            "info": "Mostro da _START_ a _END_ di _TOTAL_ record",
            "infoEmpty": "Mostro da 0 a 0 di 0 record",
            "infoFiltered": "(filtrato da _MAX_ record totali)",
-            "infoPostFix": "",
+            "infoPostFix": "|",
            "lengthMenu": "Mostra _MENU_ record",
            "loadingRecords": "Carico...",
            "paginate": {
--- a/app/translations/lol_EN.json
+++ b/app/translations/lol_EN.json
@ -143,12 +143,12 @@
                "pdf": "PDF",
                "print": "Print"
            },
-            "decimal": "",
+            "decimal": ".",
            "emptyTable": "No data available in table",
            "info": "Showing _START_ to _END_ of _TOTAL_ entries",
            "infoEmpty": "Showing 0 to 0 of 0 entries",
            "infoFiltered": "(filtered from _MAX_ total entries)",
-            "infoPostFix": "",
+            "infoPostFix": "|",
            "lengthMenu": "Show _MENU_ entries",
            "loadingRecords": "Loading...",
            "paginate": {
--- a/app/translations/lv_LV.json
+++ b/app/translations/lv_LV.json
@ -144,12 +144,12 @@
                "pdf": "PDF",
                "print": "Drukāt"
            },
-            "decimal": "",
+            "decimal": ".",
            "emptyTable": "Tabulā nav pieejami dati",
            "info": "Attēlo _START_ līdz _END_ no _TOTAL_ ierakstiem",
            "infoEmpty": "Attēlo 0 līdz 0 no 0 ierakstiem",
            "infoFiltered": "(filtrēts no _MAX_ kopējiem ierkstiem)",
-            "infoPostFix": "",
+            "infoPostFix": "|",
            "lengthMenu": "Attēlo _MENU_ ierakstus",
            "loadingRecords": "Ielādē...",
            "paginate": {
--- a/app/translations/nl_BE.json
+++ b/app/translations/nl_BE.json
@ -143,12 +143,12 @@
                "pdf": "PDF",
                "print": "Afdrukken"
            },
-            "decimal": "",
+            "decimal": ".",
            "emptyTable": "Geen data beschikbaar in de tabel",
            "info": "_START_ tot _END_ van _TOTAL_ inzendingen weergeven",
            "infoEmpty": "0 tot 0 van 0 items weergeven",
            "infoFiltered": "(gefilterd uit _MAX_ totale inzendingen)",
-            "infoPostFix": "",
+            "infoPostFix": "|",
            "lengthMenu": "Toon _MENU_ items",
            "loadingRecords": "Bezig met laden...",
            "paginate": {
--- a/app/translations/nl_NL_incomplete.json
+++ b/app/translations/nl_NL_incomplete.json
@ -131,7 +131,7 @@
            "info": "_START_ tot _END_ van _TOTAL_ entries",
            "infoEmpty": "0 tot 0 van 0 entries",
            "infoFiltered": "(Gefilterd van _MAX_ totale entries)",
-            "infoPostFix": "",
+            "infoPostFix": "|",
            "lengthMenu": "_MENU_ entries laten zien",
            "loadingRecords": "Laden...",
            "paginate": {
--- a/app/translations/pl_PL.json
+++ b/app/translations/pl_PL.json
@ -143,12 +143,12 @@
                "pdf": "PDF",
                "print": "Wydrukuj"
            },
-            "decimal": "",
+            "decimal": ".",
            "emptyTable": "Brak danych w tej tabeli danych",
            "info": "Pokazywanie od _START_ do _END_ z _TOTAL_ wszystkich wejść",
            "infoEmpty": "Pokazywanie 0 do 0 z 0 wejść",
            "infoFiltered": "(Pokazuje z _MAX_ wejść)",
-            "infoPostFix": "",
+            "infoPostFix": "|",
            "lengthMenu": "Pokazuj _MENU_ wejść",
            "loadingRecords": "Wczytywanie...",
            "paginate": {
--- a/app/translations/pt_BR_incomplete.json
+++ b/app/translations/pt_BR_incomplete.json
@ -127,12 +127,12 @@
                "pdf": "PDF",
                "print": "Imprimir"
            },
-            "decimal": "",
+            "decimal": ".",
            "emptyTable": "Nenhum dado disponível na tabela",
            "info": "Exibindo de _START_ a _END_ de _TOTAL_ entradas",
            "infoEmpty": "Exibindo de 0 a 0 de 0 entradas",
            "infoFiltered": "(filtrado de _MAX_ entradas totais)",
-            "infoPostFix": "",
+            "infoPostFix": "|",
            "lengthMenu": "Exibir _MENU_ entradas",
            "loadingRecords": "Carregando...",
            "paginate": {
--- a/app/translations/ru_RU.json
+++ b/app/translations/ru_RU.json
@ -142,12 +142,12 @@
                "pdf": "PDF",
                "print": "Печать"
            },
-            "decimal": "",
+            "decimal": ".",
            "emptyTable": "Данные в таблице отсутствуют",
            "info": "Отображение от _START_ до _END_ из _TOTAL_ записей",
            "infoEmpty": "Отображение от 0 до 0 из 0 записей",
            "infoFiltered": "(отфильтровано по _MAX_ количеству записей)",
-            "infoPostFix": "",
+            "infoPostFix": "|",
            "lengthMenu": "Показывать записи _MENU_",
            "loadingRecords": "Загрузка...",
            "paginate": {
--- a/app/translations/th_TH.json
+++ b/app/translations/th_TH.json
@ -143,12 +143,12 @@
                "pdf": "PDF",
                "print": "Print"
            },
-            "decimal": "",
+            "decimal": ".",
            "emptyTable": "ไม่มีข้อมูลในตาราง",
            "info": "แสดงรายการ _START_ ถึง _END_ จากทั้งหมด _TOTAL_ รายการ",
            "infoEmpty": "แสดงรายการ 0 ถึง 0 จากทั้งหมด 0 รายการ",
            "infoFiltered": "(กรองจากรายการทั้งหมด _MAX_ รายการ)",
-            "infoPostFix": "",
+            "infoPostFix": "|",
            "lengthMenu": "แสดง _MENU_ รายการ",
            "loadingRecords": "กำลังโหลด...",
            "paginate": {
--- a/app/translations/tr_TR.json
+++ b/app/translations/tr_TR.json
@ -143,12 +143,12 @@
                "pdf": "PDF",
                "print": "Yazdır"
            },
-            "decimal": "",
+            "decimal": ".",
            "emptyTable": "Tabloda veri bulunmuyor",
            "info": "_TOTAL_ kayıttan _START_ - _END_ arasındaki kayıtlar gösteriliyor",
            "infoEmpty": "0 kayıttan 0 - 0 arasındaki kayıtlar gösteriliyor",
            "infoFiltered": "(_MAX_ kayıt içerisinden filtrelenen)",
-            "infoPostFix": "",
+            "infoPostFix": "|",
            "lengthMenu": "_MENU_ kayıt göster",
            "loadingRecords": "Yükleniyor...",
            "paginate": {
--- a/app/translations/uk_UA.json
+++ b/app/translations/uk_UA.json
@ -143,12 +143,12 @@
                "pdf": "PDF",
                "print": "Друк"
            },
-            "decimal": "",
+            "decimal": ".",
            "emptyTable": "Немає даних у цій таблиці",
            "info": "Показ _START_ до _END_ з _TOTAL_ рядків",
            "infoEmpty": "Показ 0 до 0 з 0 рядків",
            "infoFiltered": "(відфльтровано з _MAX_ загалом рядків)",
-            "infoPostFix": "",
+            "infoPostFix": "|",
            "lengthMenu": "Показати _MENU_ рядки",
            "loadingRecords": "Завантаження...",
            "paginate": {
--- a/app/translations/zh_CN.json
+++ b/app/translations/zh_CN.json
@ -143,12 +143,12 @@
                "pdf": "PDF",
                "print": "打印"
            },
-            "decimal": "",
+            "decimal": ".",
            "emptyTable": "数据表中没有可用的数据",
            "info": "正在显示从 _START_ 到 _END_ 的共 _TOTAL_ 个项目",
            "infoEmpty": "正在显示从 0 到 0 的共 0 个项目",
            "infoFiltered": "（从 _MAX_ 个项目中筛选出）",
-            "infoPostFix": "",
+            "infoPostFix": "|",
            "lengthMenu": "显示 _MENU_ 个项目",
            "loadingRecords": "正在加载……",
            "paginate": {
--- a/requirements.txt
+++ b/requirements.txt
@ -13,7 +13,7 @@ psutil==5.9.5
 pyOpenSSL==24.2.1
 pyjwt==2.8.0
 PyYAML==6.0.1
-requests==2.32.0
+requests==2.32.3
 termcolor==1.1
 tornado==6.4.1
 tzlocal==5.1