diff --git a/.gitlab/lint.yml b/.gitlab/lint.yml
index 37649e1a..c6f8ed5c 100644
--- 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.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 35b6066d..f34ee2c1 100644
--- 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))
## --- [4.4.4] - 2024/10/03
diff --git a/app/translations/cs_CS.json b/app/translations/cs_CS.json
index 72b4ecd0..c7ab617b 100644
--- 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": {
@@ -718,4 +718,4 @@
"webhook_body": "Webhook Body",
"webhooks": "Webhooky"
}
-}
+}
\ No newline at end of file
diff --git a/app/translations/de_DE.json b/app/translations/de_DE.json
index ae55ed5b..4716fda8 100644
--- 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": {
@@ -699,4 +699,4 @@
"webhook_body": "Webhook-Inhalt",
"webhooks": "Webhooks"
}
-}
+}
\ No newline at end of file
diff --git a/app/translations/en_EN.json b/app/translations/en_EN.json
index f4b79bd0..cd401a56 100644
--- 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": {
@@ -699,4 +699,4 @@
"webhook_body": "Webhook Body",
"webhooks": "Webhooks"
}
-}
+}
\ No newline at end of file
diff --git a/app/translations/es_ES.json b/app/translations/es_ES.json
index 5a58c75b..53448405 100644
--- 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": {
@@ -699,4 +699,4 @@
"webhook_body": "Cuerpo del Webhook",
"webhooks": "Webhooks"
}
-}
+}
\ No newline at end of file
diff --git a/app/translations/fi_FI_incomplete.json b/app/translations/fi_FI.json
similarity index 99%
rename from app/translations/fi_FI_incomplete.json
rename to app/translations/fi_FI.json
index 14a7d6dc..5ed58acc 100644
--- a/app/translations/fi_FI_incomplete.json
+++ b/app/translations/fi_FI.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": {
diff --git a/app/translations/fr_FR.json b/app/translations/fr_FR.json
index 137e4455..d25de966 100644
--- 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": {
@@ -699,4 +699,4 @@
"webhook_body": "Corps du Webhook",
"webhooks": "Webhooks"
}
-}
+}
\ No newline at end of file
diff --git a/app/translations/fy_NL_incomplete.json b/app/translations/fy_NL.json
similarity index 99%
rename from app/translations/fy_NL_incomplete.json
rename to app/translations/fy_NL.json
index 54105eab..a1658298 100644
--- a/app/translations/fy_NL_incomplete.json
+++ b/app/translations/fy_NL.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": {
diff --git a/app/translations/he_IL.json b/app/translations/he_IL.json
index f17a60b4..1283d7d9 100644
--- 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": {
@@ -699,4 +699,4 @@
"webhook_body": "גוף ה-Webhook",
"webhooks": "Webhooks"
}
-}
+}
\ No newline at end of file
diff --git a/app/translations/hr_HR_incomplete.json b/app/translations/hr_HR.json
similarity index 99%
rename from app/translations/hr_HR_incomplete.json
rename to app/translations/hr_HR.json
index 975741e7..ce99c5db 100644
--- a/app/translations/hr_HR_incomplete.json
+++ b/app/translations/hr_HR.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": {
diff --git a/app/translations/id_ID_incomplete.json b/app/translations/id_ID.json
similarity index 99%
rename from app/translations/id_ID_incomplete.json
rename to app/translations/id_ID.json
index c7a1fb6f..c0494e42 100644
--- a/app/translations/id_ID_incomplete.json
+++ b/app/translations/id_ID.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": {
diff --git a/app/translations/it_IT.json b/app/translations/it_IT.json
index a3ce46e2..3d9a0e34 100644
--- 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": {
@@ -699,4 +699,4 @@
"webhook_body": "Corpo del Webhook",
"webhooks": "Webhook"
}
-}
+}
\ No newline at end of file
diff --git a/app/translations/lol_EN.json b/app/translations/lol_EN.json
index 6941a662..44675983 100644
--- 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": {
@@ -699,4 +699,4 @@
"webhook_body": "WEBHOOK FISH",
"webhooks": "WEBHOOKZ"
}
-}
+}
\ No newline at end of file
diff --git a/app/translations/lv_LV.json b/app/translations/lv_LV.json
index 64274784..ec68e6c1 100644
--- 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": {
@@ -704,4 +704,4 @@
"webhook_body": "Webhook Saturs",
"webhooks": "Webhooki"
}
-}
+}
\ No newline at end of file
diff --git a/app/translations/nl_BE.json b/app/translations/nl_BE.json
index c75654f4..3c01207b 100644
--- 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": {
@@ -703,4 +703,4 @@
"webhook_body": "Webhook-body",
"webhooks": "Webhooks"
}
-}
+}
\ No newline at end of file
diff --git a/app/translations/nl_NL_incomplete.json b/app/translations/nl_NL.json
similarity index 99%
rename from app/translations/nl_NL_incomplete.json
rename to app/translations/nl_NL.json
index 53db0def..8cf88ecf 100644
--- a/app/translations/nl_NL_incomplete.json
+++ b/app/translations/nl_NL.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": {
diff --git a/app/translations/pl_PL.json b/app/translations/pl_PL.json
index 6e73a9d2..8b2eae84 100644
--- 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": {
@@ -698,4 +698,4 @@
"webhook_body": "Treść Webhooka",
"webhooks": "Webhooki"
}
-}
+}
\ No newline at end of file
diff --git a/app/translations/pt_BR_incomplete.json b/app/translations/pt_BR.json
similarity index 99%
rename from app/translations/pt_BR_incomplete.json
rename to app/translations/pt_BR.json
index 037c1aac..0b79e207 100644
--- a/app/translations/pt_BR_incomplete.json
+++ b/app/translations/pt_BR.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": {
diff --git a/app/translations/ru_RU.json b/app/translations/ru_RU.json
index 6698ef81..6ec42f7c 100644
--- 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": {
@@ -696,4 +696,4 @@
"webhook_body": "Тело вебхука",
"webhooks": "Вебхуки"
}
-}
+}
\ No newline at end of file
diff --git a/app/translations/th_TH.json b/app/translations/th_TH.json
index 2e447473..b7cc2223 100644
--- 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": {
@@ -698,4 +698,4 @@
"webhook_body": "ภายใน Webhook",
"webhooks": "Webhooks"
}
-}
+}
\ No newline at end of file
diff --git a/app/translations/tr_TR.json b/app/translations/tr_TR.json
index 22dbc990..52e1f369 100644
--- 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": {
@@ -698,4 +698,4 @@
"webhook_body": "Webhook Gövdesi",
"webhooks": "Webhooklar"
}
-}
+}
\ No newline at end of file
diff --git a/app/translations/uk_UA.json b/app/translations/uk_UA.json
index ac6e10d9..fec444b1 100644
--- 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": {
@@ -702,4 +702,4 @@
"webhook_body": "Код Вебхука",
"webhooks": "Вебхуки"
}
-}
+}
\ No newline at end of file
diff --git a/app/translations/zh_CN.json b/app/translations/zh_CN.json
index a0768bc4..be6f3892 100644
--- 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": {
@@ -699,4 +699,4 @@
"webhook_body": "Webhook 消息体(Body)",
"webhooks": "Webhook"
}
-}
+}
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index 99415099..7bc5ae87 100644
--- 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