From 37e163e883e5b66aec9e92c9a158d8bd7b9b7e59 Mon Sep 17 00:00:00 2001 From: Jokob-sk Date: Sat, 9 Mar 2024 08:17:03 +1100 Subject: [PATCH] =?UTF-8?q?lang=20updates=20=F0=9F=8C=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/js/pialert_common.js | 11 ++++++++++- front/php/templates/language/de_de.json | 3 --- front/php/templates/language/en_us.json | 3 --- front/php/templates/language/es_es.json | 3 --- front/php/templates/language/fr_fr.json | 3 --- front/php/templates/language/lang.php | 5 ++++- front/php/templates/language/nb_no.json | 3 --- front/php/templates/language/ru_ru.json | 3 --- 8 files changed, 14 insertions(+), 20 deletions(-) diff --git a/front/js/pialert_common.js b/front/js/pialert_common.js index f2ffc209..5222a018 100755 --- a/front/js/pialert_common.js +++ b/front/js/pialert_common.js @@ -147,7 +147,7 @@ function cacheStrings() { // handle core strings and translations - var allLanguages = ["en_us", "es_es", "de_de"]; // needs to be same as in lang.php + var allLanguages = ["en_us", "es_es", "de_de", "fr_fr", "ru_ru", "nb_no"]; // needs to be same as in lang.php allLanguages.forEach(function (language_code) { $.get(`php/templates/language/${language_code}.json?nocache=${Date.now()}`, function (res) { @@ -193,6 +193,15 @@ function getString (key) { case 'German': lang_code = 'de_de'; break; + case 'French': + lang_code = 'fr_fr'; + break; + case 'Norwegian': + lang_code = 'nb_no'; + break; + case 'Russian': + lang_code = 'ru_ru'; + break; } result = getCache(`pia_lang_${key}_${lang_code}`, true); diff --git a/front/php/templates/language/de_de.json b/front/php/templates/language/de_de.json index d3e8cda7..381d9dcb 100755 --- a/front/php/templates/language/de_de.json +++ b/front/php/templates/language/de_de.json @@ -442,9 +442,6 @@ "Maintenance_database_path": "Datenbank-Pfad", "Maintenance_database_rows": "Tabelle (Reihen)", "Maintenance_database_size": "Datenbank-Gr\u00f6\u00dfe", - "Maintenance_lang_de_de": "Deutsch (DE)", - "Maintenance_lang_en_us": "Englisch (US)", - "Maintenance_lang_es_es": "Spanisch (ES)", "Maintenance_lang_selector_apply": "\u00dcbernehmen", "Maintenance_lang_selector_empty": "Sprache w\u00e4hlen", "Maintenance_lang_selector_lable": "Sprachauswahl", diff --git a/front/php/templates/language/en_us.json b/front/php/templates/language/en_us.json index 21796d40..db6acdf2 100755 --- a/front/php/templates/language/en_us.json +++ b/front/php/templates/language/en_us.json @@ -416,9 +416,6 @@ "Maintenance_database_path": "Database-Path", "Maintenance_database_rows": "Table (Rows)", "Maintenance_database_size": "Database-Size", - "Maintenance_lang_de_de": "German (DE)", - "Maintenance_lang_en_us": "English (US)", - "Maintenance_lang_es_es": "Spanish (ES)", "Maintenance_lang_selector_apply": "Apply", "Maintenance_lang_selector_empty": "Choose Language", "Maintenance_lang_selector_lable": "Select Language", diff --git a/front/php/templates/language/es_es.json b/front/php/templates/language/es_es.json index ff1d0d29..7e3a560b 100755 --- a/front/php/templates/language/es_es.json +++ b/front/php/templates/language/es_es.json @@ -440,9 +440,6 @@ "Maintenance_database_path": "Ruta de la base de datos", "Maintenance_database_rows": "Tabla (Filas)", "Maintenance_database_size": "Tama\u00f1o de base de datos", - "Maintenance_lang_de_de": "German (DE)", - "Maintenance_lang_en_us": "English (US)", - "Maintenance_lang_es_es": "Spanish (ES)", "Maintenance_lang_selector_apply": "Aplicar", "Maintenance_lang_selector_empty": "Elija un idioma", "Maintenance_lang_selector_lable": "Seleccione su idioma", diff --git a/front/php/templates/language/fr_fr.json b/front/php/templates/language/fr_fr.json index ffb8982d..52d9321c 100755 --- a/front/php/templates/language/fr_fr.json +++ b/front/php/templates/language/fr_fr.json @@ -416,9 +416,6 @@ "Maintenance_database_path": "Chemin de la base de donn\u00e9es", "Maintenance_database_rows": "", "Maintenance_database_size": "", - "Maintenance_lang_de_de": "", - "Maintenance_lang_en_us": "", - "Maintenance_lang_es_es": "", "Maintenance_lang_selector_apply": "Appliquer", "Maintenance_lang_selector_empty": "", "Maintenance_lang_selector_lable": "", diff --git a/front/php/templates/language/lang.php b/front/php/templates/language/lang.php index 537a6be5..29141900 100755 --- a/front/php/templates/language/lang.php +++ b/front/php/templates/language/lang.php @@ -5,7 +5,7 @@ // ################################### $defaultLang = "en_us"; -$allLanguages = ["en_us","es_es","de_de"]; +$allLanguages = ["en_us","es_es","de_de", "nb_no", "ru_ru", "fr_fr"]; global $db; @@ -13,6 +13,9 @@ $result = $db->querySingle("SELECT Value FROM Settings WHERE Code_Name = 'UI_LAN switch($result){ case 'Spanish': $pia_lang_selected = 'es_es'; break; case 'German': $pia_lang_selected = 'de_de'; break; + case 'Norwegian': $pia_lang_selected = 'nb_no'; break; + case 'Russian': $pia_lang_selected = 'ru_ru'; break; + case 'French': $pia_lang_selected = 'fr_fr'; break; default: $pia_lang_selected = 'en_us'; break; } diff --git a/front/php/templates/language/nb_no.json b/front/php/templates/language/nb_no.json index 3479c7f0..10283d2f 100755 --- a/front/php/templates/language/nb_no.json +++ b/front/php/templates/language/nb_no.json @@ -416,9 +416,6 @@ "Maintenance_database_path": "", "Maintenance_database_rows": "", "Maintenance_database_size": "", - "Maintenance_lang_de_de": "", - "Maintenance_lang_en_us": "", - "Maintenance_lang_es_es": "", "Maintenance_lang_selector_apply": "", "Maintenance_lang_selector_empty": "", "Maintenance_lang_selector_lable": "", diff --git a/front/php/templates/language/ru_ru.json b/front/php/templates/language/ru_ru.json index cdb032ce..85fcbc79 100755 --- a/front/php/templates/language/ru_ru.json +++ b/front/php/templates/language/ru_ru.json @@ -416,9 +416,6 @@ "Maintenance_database_path": "", "Maintenance_database_rows": "", "Maintenance_database_size": "", - "Maintenance_lang_de_de": "", - "Maintenance_lang_en_us": "", - "Maintenance_lang_es_es": "", "Maintenance_lang_selector_apply": "", "Maintenance_lang_selector_empty": "", "Maintenance_lang_selector_lable": "",