From 750839053ea9f9a4bc029ccdba8d5b739095a70f Mon Sep 17 00:00:00 2001 From: Armilar <102996011+Armilar@users.noreply.github.com> Date: Sat, 18 Jun 2022 23:08:06 +0200 Subject: [PATCH 01/13] Update ioBroker_NSPanel_locales.json --- ioBroker/ioBroker_NSPanel_locales.json | 203 +++++++++++++------------ 1 file changed, 106 insertions(+), 97 deletions(-) diff --git a/ioBroker/ioBroker_NSPanel_locales.json b/ioBroker/ioBroker_NSPanel_locales.json index 0b26055a..c7b49f10 100644 --- a/ioBroker/ioBroker_NSPanel_locales.json +++ b/ioBroker/ioBroker_NSPanel_locales.json @@ -1,134 +1,143 @@ { "lights": { "Brightness": { - "en_US": "Brightness", - "de_DE": "Helligkeit", - "nl_NL": "Helderheid", - "da_DK": "Lysstyrke", - "es_ES": "Brillo", - "fr_FR": "Luminosité", - "it_IT": "Luminosità", - "ru_RU": "Яркость" + "en-US": "Brightness", + "de-DE": "Helligkeit", + "nl-NL": "Helderheid", + "da-DK": "Lysstyrke", + "es-ES": "Brillo", + "fr-FR": "Luminosité", + "it-IT": "Luminosità", + "ru-RU": "Яркость" + }, + "Color":{ + "en-EN":"Color", + "de-DE":"Farbe", + "nl-NL":"Kleur", + "da-DK":"Farve", + "es-ES":"Colore", + "fr-FR":"Couleur", + "ru-RU":"цвет" }, "Temperature": { - "en_US": "Color temperature", - "de_DE": "Farbtemperatur", - "nl_NL": "Kleurtemperatuur", - "da_DK": "Farvetemperatur", - "es_ES": "Temperatura del color", - "fr_FR": "Température de couleur", - "it_IT": "Temperatura colore", - "ru_RU": "Цветовая температура" + "en-US": "Color temperature", + "de-DE": "Farbtemperatur", + "nl-NL": "Kleurtemperatuur", + "da-DK": "Farvetemperatur", + "es-ES": "Temperatura del color", + "fr-FR": "Température de couleur", + "it-IT": "Temperatura colore", + "ru-RU": "Цветовая температура" } }, "window": { "closed": { - "en_US": "Closed", - "de_DE": "Geschlossen", - "nl_NL": "Dicht", - "da_DK": "Lukket", - "es_ES": "Cerrada", - "fr_FR": "Fermée", - "it_IT": "Chiusa", - "ru_RU": "Закрыто" + "en-US": "Closed", + "de-DE": "Geschlossen", + "nl-NL": "Dicht", + "da-DK": "Lukket", + "es-ES": "Cerrada", + "fr-FR": "Fermée", + "it-IT": "Chiusa", + "ru-RU": "Закрыто" }, "opened": { - "en_US": "Open", - "de_DE": "Offen", - "nl_NL": "Open", - "da_DK": "Åben", - "es_ES": "Abierta", - "fr_FR": "Ouverte", - "it_IT": "Aperta", - "ru_RU": "Открыто" + "en-US": "Open", + "de-DE": "Offen", + "nl-NL": "Open", + "da-DK": "Åben", + "es-ES": "Abierta", + "fr-FR": "Ouverte", + "it-IT": "Aperta", + "ru-RU": "Открыто" } }, "door": { "closed": { - "en_US": "Closed", - "de_DE": "Geschlossen", - "nl_NL": "Dicht", - "da_DK": "Lukket", - "es_ES": "Cerrada", - "fr_FR": "Fermée", - "it_IT": "Chiusa", - "ru_RU": "Закрыта" + "en-US": "Closed", + "de-DE": "Geschlossen", + "nl-NL": "Dicht", + "da-DK": "Lukket", + "es-ES": "Cerrada", + "fr-FR": "Fermée", + "it-IT": "Chiusa", + "ru-RU": "Закрыта" }, "opened": { - "en_US": "Open", - "de_DE": "Offen", - "nl_NL": "Open", - "da_DK": "Åben", - "es_ES": "Abierta", - "fr_FR": "Ouverte", - "it_IT": "Aperta", - "ru_RU": "Открыта" + "en-US": "Open", + "de-DE": "Offen", + "nl-NL": "Open", + "da-DK": "Åben", + "es-ES": "Abierta", + "fr-FR": "Ouverte", + "it-IT": "Aperta", + "ru-RU": "Открыта" } }, "lock": { "LOCK": { - "en_US": "Lock", - "de_DE": "Verriegeln", - "nl_NL": "Vergrendelen", - "da_DK": "Lås", - "es_ES": "Bloquear", - "fr_FR": "Verrouiller", - "it_IT": "Blocca", - "ru_RU": "Закрыть" + "en-US": "Lock", + "de-DE": "Verriegeln", + "nl-NL": "Vergrendelen", + "da-DK": "Lås", + "es-ES": "Bloquear", + "fr-FR": "Verrouiller", + "it-IT": "Blocca", + "ru-RU": "Закрыть" }, "UNLOCK": { - "en_US": "Unlock", - "de_DE": "Entriegeln", - "nl_NL": "Ontgrendelen", - "da_DK": "Lås op", - "es_ES": "Desbloquear", - "fr_FR": "Déverrouiller", - "it_IT": "Sblocca", - "ru_RU": "Открыть" + "en-US": "Unlock", + "de-DE": "Entriegeln", + "nl-NL": "Ontgrendelen", + "da-DK": "Lås op", + "es-ES": "Desbloquear", + "fr-FR": "Déverrouiller", + "it-IT": "Sblocca", + "ru-RU": "Открыть" } }, "blinds": { "Position": { - "en_US": "Position", - "de_DE": "Position", - "nl_NL": "Positie", - "da_DK": "Position", - "es_ES": "Posición", - "fr_FR": "Position", - "it_IT": "Apertura", - "ru_RU": "Положение" + "en-US": "Position", + "de-DE": "Position", + "nl-NL": "Positie", + "da-DK": "Position", + "es-ES": "Posición", + "fr-FR": "Position", + "it-IT": "Apertura", + "ru-RU": "Положение" } }, "thermostat": { "Currently": { - "en_US": "Currently", - "de_DE": "Aktuell", - "nl_NL": "Momenteel", - "da_DK": "Aktuelt", - "es_ES": "Actualmente", - "fr_FR": "Actuellement", - "it_IT": "Attualmente", - "ru_RU": "Сейчас" + "en-US": "Currently", + "de-DE": "Aktuell", + "nl-NL": "Momenteel", + "da-DK": "Aktuelt", + "es-ES": "Actualmente", + "fr-FR": "Actuellement", + "it-IT": "Attualmente", + "ru-RU": "Сейчас" }, "State": { - "en_US": "State", - "de_DE": "Zustand", - "nl_NL": "Toestand", - "da_DK": "Tilstand", - "es_ES": "Estado", - "fr_FR": "État", - "it_IT": "Stato", - "ru_RU": "Состояние" + "en-US": "State", + "de-DE": "Zustand", + "nl-NL": "Toestand", + "da-DK": "Tilstand", + "es-ES": "Estado", + "fr-FR": "État", + "it-IT": "Stato", + "ru-RU": "Состояние" }, "Action": { - "en_US": "Operation", - "de_DE": "Aktion", - "nl_NL": "Werking", - "da_DK": "Drifttype", - "es_ES": "Modo", - "fr_FR": "Opération", - "it_IT": "Operazione", - "ru_RU": "Режим работы" + "en-US": "Operation", + "de-DE": "Aktion", + "nl-NL": "Werking", + "da-DK": "Drifttype", + "es-ES": "Modo", + "fr-FR": "Opération", + "it-IT": "Operazione", + "ru-RU": "Режим работы" } } -} \ No newline at end of file +} From 6049c29dfd0dc0d8b18376d9c2760e426778caa0 Mon Sep 17 00:00:00 2001 From: Armilar <102996011+Armilar@users.noreply.github.com> Date: Sat, 18 Jun 2022 23:09:53 +0200 Subject: [PATCH 02/13] Update ioBroker_NSPanel_locales.json --- ioBroker/ioBroker_NSPanel_locales.json | 282 ++++++++++++------------- 1 file changed, 141 insertions(+), 141 deletions(-) diff --git a/ioBroker/ioBroker_NSPanel_locales.json b/ioBroker/ioBroker_NSPanel_locales.json index c7b49f10..82269063 100644 --- a/ioBroker/ioBroker_NSPanel_locales.json +++ b/ioBroker/ioBroker_NSPanel_locales.json @@ -1,143 +1,143 @@ { - "lights": { - "Brightness": { - "en-US": "Brightness", - "de-DE": "Helligkeit", - "nl-NL": "Helderheid", - "da-DK": "Lysstyrke", - "es-ES": "Brillo", - "fr-FR": "Luminosité", - "it-IT": "Luminosità", - "ru-RU": "Яркость" - }, - "Color":{ - "en-EN":"Color", - "de-DE":"Farbe", - "nl-NL":"Kleur", - "da-DK":"Farve", - "es-ES":"Colore", - "fr-FR":"Couleur", - "ru-RU":"цвет" - }, - "Temperature": { - "en-US": "Color temperature", - "de-DE": "Farbtemperatur", - "nl-NL": "Kleurtemperatuur", - "da-DK": "Farvetemperatur", - "es-ES": "Temperatura del color", - "fr-FR": "Température de couleur", - "it-IT": "Temperatura colore", - "ru-RU": "Цветовая температура" - } - }, - "window": { - "closed": { - "en-US": "Closed", - "de-DE": "Geschlossen", - "nl-NL": "Dicht", - "da-DK": "Lukket", - "es-ES": "Cerrada", - "fr-FR": "Fermée", - "it-IT": "Chiusa", - "ru-RU": "Закрыто" - }, - "opened": { - "en-US": "Open", - "de-DE": "Offen", - "nl-NL": "Open", - "da-DK": "Åben", - "es-ES": "Abierta", - "fr-FR": "Ouverte", - "it-IT": "Aperta", - "ru-RU": "Открыто" - } - }, - "door": { - "closed": { - "en-US": "Closed", - "de-DE": "Geschlossen", - "nl-NL": "Dicht", - "da-DK": "Lukket", - "es-ES": "Cerrada", - "fr-FR": "Fermée", - "it-IT": "Chiusa", - "ru-RU": "Закрыта" - }, - "opened": { - "en-US": "Open", - "de-DE": "Offen", - "nl-NL": "Open", - "da-DK": "Åben", - "es-ES": "Abierta", - "fr-FR": "Ouverte", - "it-IT": "Aperta", - "ru-RU": "Открыта" - } - }, - "lock": { - "LOCK": { - "en-US": "Lock", - "de-DE": "Verriegeln", - "nl-NL": "Vergrendelen", - "da-DK": "Lås", - "es-ES": "Bloquear", - "fr-FR": "Verrouiller", - "it-IT": "Blocca", - "ru-RU": "Закрыть" - }, - "UNLOCK": { - "en-US": "Unlock", - "de-DE": "Entriegeln", - "nl-NL": "Ontgrendelen", - "da-DK": "Lås op", - "es-ES": "Desbloquear", - "fr-FR": "Déverrouiller", - "it-IT": "Sblocca", - "ru-RU": "Открыть" - } - }, - "blinds": { - "Position": { - "en-US": "Position", - "de-DE": "Position", - "nl-NL": "Positie", - "da-DK": "Position", - "es-ES": "Posición", - "fr-FR": "Position", - "it-IT": "Apertura", - "ru-RU": "Положение" - } - }, - "thermostat": { - "Currently": { - "en-US": "Currently", - "de-DE": "Aktuell", - "nl-NL": "Momenteel", - "da-DK": "Aktuelt", - "es-ES": "Actualmente", - "fr-FR": "Actuellement", - "it-IT": "Attualmente", - "ru-RU": "Сейчас" - }, - "State": { - "en-US": "State", - "de-DE": "Zustand", - "nl-NL": "Toestand", - "da-DK": "Tilstand", - "es-ES": "Estado", - "fr-FR": "État", - "it-IT": "Stato", - "ru-RU": "Состояние" - }, - "Action": { - "en-US": "Operation", - "de-DE": "Aktion", - "nl-NL": "Werking", - "da-DK": "Drifttype", - "es-ES": "Modo", - "fr-FR": "Opération", - "it-IT": "Operazione", - "ru-RU": "Режим работы" - } - } + "lights":{ + "Brightness":{ + "en-EN":"Brightness", + "de-DE":"Helligkeit", + "nl-NL":"Helderheid", + "da-DK":"Lysstyrke", + "es-ES":"Brillo", + "fr-FR":"Luminosité", + "it-IT":"Luminosità", + "ru-RU":"Яркость" + }, + "Color":{ + "en-EN":"Color", + "de-DE":"Farbe", + "nl-NL":"Kleur", + "da-DK":"Farve", + "es-ES":"Colore", + "fr-FR":"Couleur", + "ru-RU":"цвет" + }, + "Temperature":{ + "en-EN":"Temperature", + "de-DE":"Temperatur", + "nl-NL":"Temperatuur", + "da-DK":"Temperatur", + "es-ES":"temperatura", + "fr-FR":"Température", + "it-IT":"Temperatura", + "ru-RU":"температура" + } + }, + "window":{ + "closed":{ + "en-EN":"closed", + "de-DE":"geschlossen", + "nl-NL":"gesloten", + "da-DK":"lukket", + "es-ES":"cerrada", + "fr-FR":"fermée ", + "it-IT":"chiusa", + "ru-RU":"закрыто" + }, + "opened":{ + "en-EN":"opened", + "de-DE":"offen", + "nl-NL":"geopend", + "da-DK":"åbnede", + "es-ES":"abierta", + "fr-FR":"ouverte ", + "it-IT":"aperta", + "ru-RU":"открыто" + } + }, + "door":{ + "closed":{ + "en-EN":"closed", + "de-DE":"geschlossen", + "nl-NL":"gesloten", + "da-DK":"lukket", + "es-ES":"cerrada", + "fr-FR":"fermée ", + "it-IT":"chiusa", + "ru-RU":"закрыто" + }, + "opened":{ + "en-EN":"opened", + "de-DE":"offen", + "nl-NL":"geopend", + "da-DK":"åbnede", + "es-ES":"abierta", + "fr-FR":"ouverte ", + "it-IT":"aperta", + "ru-RU":"открыто" + } + }, + "lock":{ + "LOCK":{ + "en-EN":"lock", + "de-DE":"schließen", + "nl-NL":"stilgelegd", + "da-DK":"låse", + "es-ES":"cerrar", + "fr-FR":"bloquer ", + "it-IT":"serratura", + "ru-RU":"замок" + }, + "UNLOCK":{ + "en-EN":"unlock", + "de-DE":"öffnen", + "nl-NL":"openen", + "da-DK":"at åbne", + "es-ES":"abrir", + "fr-FR":"ouvrir ", + "it-IT":"aprire", + "ru-RU":"открыть" + } + }, + "blinds":{ + "Position":{ + "en-EN":"Position", + "de-DE":"Position", + "nl-NL":"Positie", + "da-DK":"Blindstilling", + "es-ES":"Posición", + "fr-FR":"Position ", + "it-IT":"Posizione", + "ru-RU":"Слепая" + } + }, + "thermostat":{ + "Currently":{ + "en-EN":"Currently", + "de-DE":"Aktuell", + "nl-NL":"momenteel", + "da-DK":"i øjeblikket", + "es-ES":"corrientemente", + "fr-FR":"actuellement ", + "it-IT":"attualmente", + "ru-RU":"актуальный" + }, + "State":{ + "en-EN":"State", + "de-DE":"Status", + "nl-NL":"toestand", + "da-DK":"stat", + "es-ES":"estado", + "fr-FR":"statut ", + "it-IT":"stato", + "ru-RU":"статус" + }, + "Action":{ + "en-EN":"Action", + "de-DE":"Aktion", + "nl-NL":"actie", + "da-DK":"handling", + "es-ES":"acción", + "fr-FR":"action ", + "it-IT":"azione", + "ru-RU":"действие" + } + } } From 0a23fc16a548f614a6d4b233de43c787a33d9a73 Mon Sep 17 00:00:00 2001 From: Johannes Date: Sat, 18 Jun 2022 23:26:00 +0200 Subject: [PATCH 03/13] Update bug_report.md --- .github/ISSUE_TEMPLATE/bug_report.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 58a32378..2af0efbd 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -11,11 +11,15 @@ assignees: '' This issue template is meant to REPORT BUGS/PROBLEMS ONLY Please take a few minutes to complete the requested information below. -The ability to provide assistance is greatly hampered without it. +The ability to provide assistance is greatly hampered without it. + +PLEASE RESTART APPDAEMON BEFORE SUBMITTING AN ISSUE +To reload all modules after an Update it is reqired to restart the AppDaemon Container, as noted in every Release Notes. DO NOT DELETE ANY TEXT from this template! Otherwise the issue will be auto-closed. --> + ### PROBLEM DESCRIPTION _A clear and concise description of what the problem is._ From a490ed3966fa3ae9288aea36194a8ec13fbcfa29 Mon Sep 17 00:00:00 2001 From: Johannes Date: Sun, 19 Jun 2022 00:18:38 +0200 Subject: [PATCH 04/13] Update config-overview.md --- docs/config-overview.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/config-overview.md b/docs/config-overview.md index e2632188..e368c657 100644 --- a/docs/config-overview.md +++ b/docs/config-overview.md @@ -52,7 +52,7 @@ key | optional | type | default | description -- | -- | -- | -- | -- `panelRecvTopic` | False | string | `tele/tasmota_your_mqtt_topic/RESULT` | The mqtt topic used to receive messages. `panelSendTopic` | False | string | `cmnd/tasmota_your_mqtt_topic/CustomSend` | The mqtt topic used to send messages. -`updateMode` | True | string | `auto-notify` | Update Mode; Possible values: "auto", "auto-notify", "manual" +`updateMode` | True | string | `auto-notify` | Update Mode for flashing of the nextion display firmware, by default it is showing a message asking for the update after updating the app in HACS; Possible values: "auto", "auto-notify", "manual" `model` | True | string | `eu` | Model; Possible values: "eu", "us-l" and "us-p" `sleepTimeout` | True | integer | `20` | Timeout for the screen to enter screensaver, to disable screensaver use 0 `sleepBrightness` | True | integer/complex | `20` | Brightness for the screen on the screensaver, see example below for complex/scheduled config. From 95e73ed15d1d762d506c97f59328ff6f4c4a85bb Mon Sep 17 00:00:00 2001 From: Johannes Date: Sun, 19 Jun 2022 00:19:54 +0200 Subject: [PATCH 05/13] Update config-overview.md --- docs/config-overview.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/config-overview.md b/docs/config-overview.md index e368c657..4e002fd7 100644 --- a/docs/config-overview.md +++ b/docs/config-overview.md @@ -52,7 +52,7 @@ key | optional | type | default | description -- | -- | -- | -- | -- `panelRecvTopic` | False | string | `tele/tasmota_your_mqtt_topic/RESULT` | The mqtt topic used to receive messages. `panelSendTopic` | False | string | `cmnd/tasmota_your_mqtt_topic/CustomSend` | The mqtt topic used to send messages. -`updateMode` | True | string | `auto-notify` | Update Mode for flashing of the nextion display firmware, by default it is showing a message asking for the update after updating the app in HACS; Possible values: "auto", "auto-notify", "manual" +`updateMode` | True | string | `auto-notify` | Update Mode for flashing of the nextion display firmware, by default it is showing a message asking for the update after updating the backend app in HACS; Possible values: "auto", "auto-notify", "manual" `model` | True | string | `eu` | Model; Possible values: "eu", "us-l" and "us-p" `sleepTimeout` | True | integer | `20` | Timeout for the screen to enter screensaver, to disable screensaver use 0 `sleepBrightness` | True | integer/complex | `20` | Brightness for the screen on the screensaver, see example below for complex/scheduled config. From df27a7f66d4e93d6d4554b06a641e1e01965fc4b Mon Sep 17 00:00:00 2001 From: Armilar <102996011+Armilar@users.noreply.github.com> Date: Sun, 19 Jun 2022 13:16:31 +0200 Subject: [PATCH 06/13] Update iobroker.py --- HMI/code_gen/localization/iobroker.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/HMI/code_gen/localization/iobroker.py b/HMI/code_gen/localization/iobroker.py index 7672b073..d5a39c30 100644 --- a/HMI/code_gen/localization/iobroker.py +++ b/HMI/code_gen/localization/iobroker.py @@ -19,20 +19,20 @@ keys = { } -langs = ["en_US", "de_DE", "nl_NL", "da_DK", "es_ES", "fr_FR", "it_IT", "ru_RU"] +langs = ["en-US", "de-DE", "nl-NL", "da-DK", "es-ES", "fr-FR", "it-IT", "ru-RU", "nb-NO", "pl-PL", "pt-PT"] def build_locale_filestring(locale): - if locale in ["zh_CN", "zh_Hans_CN", "zh_Hans"]: + if locale in ["zh-CN", "zh-Hans-CN", "zh-Hans"]: locale = "zh-Hans" - elif locale in ["zh_TW", "zh_Hant_TW", "zh_Hant"]: + elif locale in ["zh-TW", "zh-Hant-TW", "zh-Hant"]: locale = "zh-Hant" elif locale == "en_GB": locale = "en-GB" elif locale == "pt_BR": locale = "pt-BR" else: - locale = locale.split("_")[0] + locale = locale.split("-")[0] filename = f"{locale}.json" dir_path = os.getcwd() @@ -65,4 +65,4 @@ for src, dst in keys.items(): #print(json.dumps(out, indent=4, ensure_ascii=False)) with open("ioBroker_NSPanel_locales.json", "wb") as text_file: - text_file.write(json.dumps(out, indent=4, ensure_ascii=False).encode('utf8')) \ No newline at end of file + text_file.write(json.dumps(out, indent=4, ensure_ascii=False).encode('utf8')) From 6dedd96fc702fb6cf430ed9f5f190e0970a3a583 Mon Sep 17 00:00:00 2001 From: Armilar Date: Sun, 19 Jun 2022 11:16:47 +0000 Subject: [PATCH 07/13] Update iobroker localization file --- ioBroker/ioBroker_NSPanel_locales.json | 311 ++++++++++++++----------- 1 file changed, 169 insertions(+), 142 deletions(-) diff --git a/ioBroker/ioBroker_NSPanel_locales.json b/ioBroker/ioBroker_NSPanel_locales.json index 82269063..b429a440 100644 --- a/ioBroker/ioBroker_NSPanel_locales.json +++ b/ioBroker/ioBroker_NSPanel_locales.json @@ -1,143 +1,170 @@ { - "lights":{ - "Brightness":{ - "en-EN":"Brightness", - "de-DE":"Helligkeit", - "nl-NL":"Helderheid", - "da-DK":"Lysstyrke", - "es-ES":"Brillo", - "fr-FR":"Luminosité", - "it-IT":"Luminosità", - "ru-RU":"Яркость" - }, - "Color":{ - "en-EN":"Color", - "de-DE":"Farbe", - "nl-NL":"Kleur", - "da-DK":"Farve", - "es-ES":"Colore", - "fr-FR":"Couleur", - "ru-RU":"цвет" - }, - "Temperature":{ - "en-EN":"Temperature", - "de-DE":"Temperatur", - "nl-NL":"Temperatuur", - "da-DK":"Temperatur", - "es-ES":"temperatura", - "fr-FR":"Température", - "it-IT":"Temperatura", - "ru-RU":"температура" - } - }, - "window":{ - "closed":{ - "en-EN":"closed", - "de-DE":"geschlossen", - "nl-NL":"gesloten", - "da-DK":"lukket", - "es-ES":"cerrada", - "fr-FR":"fermée ", - "it-IT":"chiusa", - "ru-RU":"закрыто" - }, - "opened":{ - "en-EN":"opened", - "de-DE":"offen", - "nl-NL":"geopend", - "da-DK":"åbnede", - "es-ES":"abierta", - "fr-FR":"ouverte ", - "it-IT":"aperta", - "ru-RU":"открыто" - } - }, - "door":{ - "closed":{ - "en-EN":"closed", - "de-DE":"geschlossen", - "nl-NL":"gesloten", - "da-DK":"lukket", - "es-ES":"cerrada", - "fr-FR":"fermée ", - "it-IT":"chiusa", - "ru-RU":"закрыто" - }, - "opened":{ - "en-EN":"opened", - "de-DE":"offen", - "nl-NL":"geopend", - "da-DK":"åbnede", - "es-ES":"abierta", - "fr-FR":"ouverte ", - "it-IT":"aperta", - "ru-RU":"открыто" - } - }, - "lock":{ - "LOCK":{ - "en-EN":"lock", - "de-DE":"schließen", - "nl-NL":"stilgelegd", - "da-DK":"låse", - "es-ES":"cerrar", - "fr-FR":"bloquer ", - "it-IT":"serratura", - "ru-RU":"замок" - }, - "UNLOCK":{ - "en-EN":"unlock", - "de-DE":"öffnen", - "nl-NL":"openen", - "da-DK":"at åbne", - "es-ES":"abrir", - "fr-FR":"ouvrir ", - "it-IT":"aprire", - "ru-RU":"открыть" - } - }, - "blinds":{ - "Position":{ - "en-EN":"Position", - "de-DE":"Position", - "nl-NL":"Positie", - "da-DK":"Blindstilling", - "es-ES":"Posición", - "fr-FR":"Position ", - "it-IT":"Posizione", - "ru-RU":"Слепая" - } - }, - "thermostat":{ - "Currently":{ - "en-EN":"Currently", - "de-DE":"Aktuell", - "nl-NL":"momenteel", - "da-DK":"i øjeblikket", - "es-ES":"corrientemente", - "fr-FR":"actuellement ", - "it-IT":"attualmente", - "ru-RU":"актуальный" - }, - "State":{ - "en-EN":"State", - "de-DE":"Status", - "nl-NL":"toestand", - "da-DK":"stat", - "es-ES":"estado", - "fr-FR":"statut ", - "it-IT":"stato", - "ru-RU":"статус" - }, - "Action":{ - "en-EN":"Action", - "de-DE":"Aktion", - "nl-NL":"actie", - "da-DK":"handling", - "es-ES":"acción", - "fr-FR":"action ", - "it-IT":"azione", - "ru-RU":"действие" - } - } -} + "lights": { + "Brightness": { + "en-US": "Brightness", + "de-DE": "Helligkeit", + "nl-NL": "Helderheid", + "da-DK": "Lysstyrke", + "es-ES": "Brillo", + "fr-FR": "Luminosité", + "it-IT": "Luminosità", + "ru-RU": "Яркость", + "nb-NO": "Lysstyrke", + "pl-PL": "Jasność", + "pt-PT": "Brilho" + }, + "Temperature": { + "en-US": "Color temperature", + "de-DE": "Farbtemperatur", + "nl-NL": "Kleurtemperatuur", + "da-DK": "Farvetemperatur", + "es-ES": "Temperatura del color", + "fr-FR": "Température de couleur", + "it-IT": "Temperatura colore", + "ru-RU": "Цветовая температура", + "nb-NO": "Fargetemperatur", + "pl-PL": "Temperatura barwy", + "pt-PT": "Temperatura de cor" + } + }, + "window": { + "closed": { + "en-US": "Closed", + "de-DE": "Geschlossen", + "nl-NL": "Dicht", + "da-DK": "Lukket", + "es-ES": "Cerrada", + "fr-FR": "Fermée", + "it-IT": "Chiusa", + "ru-RU": "Закрыто", + "nb-NO": "Lukket", + "pl-PL": "zamknięte", + "pt-PT": "Fechada" + }, + "opened": { + "en-US": "Open", + "de-DE": "Offen", + "nl-NL": "Open", + "da-DK": "Åben", + "es-ES": "Abierta", + "fr-FR": "Ouverte", + "it-IT": "Aperta", + "ru-RU": "Открыто", + "nb-NO": "Åpent", + "pl-PL": "otwarte", + "pt-PT": "Aberta" + } + }, + "door": { + "closed": { + "en-US": "Closed", + "de-DE": "Geschlossen", + "nl-NL": "Dicht", + "da-DK": "Lukket", + "es-ES": "Cerrada", + "fr-FR": "Fermée", + "it-IT": "Chiusa", + "ru-RU": "Закрыта", + "nb-NO": "Lukket", + "pl-PL": "zamknięte", + "pt-PT": "Fechada" + }, + "opened": { + "en-US": "Open", + "de-DE": "Offen", + "nl-NL": "Open", + "da-DK": "Åben", + "es-ES": "Abierta", + "fr-FR": "Ouverte", + "it-IT": "Aperta", + "ru-RU": "Открыта", + "nb-NO": "Åpen", + "pl-PL": "otwarte", + "pt-PT": "Aberta" + } + }, + "lock": { + "LOCK": { + "en-US": "Lock", + "de-DE": "Verriegeln", + "nl-NL": "Vergrendelen", + "da-DK": "Lås", + "es-ES": "Bloquear", + "fr-FR": "Verrouiller", + "it-IT": "Blocca", + "ru-RU": "Закрыть", + "nb-NO": "Lås", + "pl-PL": "Zablokuj", + "pt-PT": "Bloquear" + }, + "UNLOCK": { + "en-US": "Unlock", + "de-DE": "Entriegeln", + "nl-NL": "Ontgrendelen", + "da-DK": "Lås op", + "es-ES": "Desbloquear", + "fr-FR": "Déverrouiller", + "it-IT": "Sblocca", + "ru-RU": "Открыть", + "nb-NO": "Lås opp", + "pl-PL": "Odblokuj", + "pt-PT": "Desbloquear" + } + }, + "blinds": { + "Position": { + "en-US": "Position", + "de-DE": "Position", + "nl-NL": "Positie", + "da-DK": "Position", + "es-ES": "Posición", + "fr-FR": "Position", + "it-IT": "Apertura", + "ru-RU": "Положение", + "nb-NO": "Posisjon", + "pl-PL": "Pozycja", + "pt-PT": "Posição" + } + }, + "thermostat": { + "Currently": { + "en-US": "Currently", + "de-DE": "Aktuell", + "nl-NL": "Momenteel", + "da-DK": "Aktuelt", + "es-ES": "Actualmente", + "fr-FR": "Actuellement", + "it-IT": "Attualmente", + "ru-RU": "Сейчас", + "nb-NO": "Er nå", + "pl-PL": "Obecnie", + "pt-PT": "Atualmente" + }, + "State": { + "en-US": "State", + "de-DE": "Zustand", + "nl-NL": "Toestand", + "da-DK": "Tilstand", + "es-ES": "Estado", + "fr-FR": "État", + "it-IT": "Stato", + "ru-RU": "Состояние", + "nb-NO": "Tilstand", + "pl-PL": "Stan", + "pt-PT": "Estado" + }, + "Action": { + "en-US": "Operation", + "de-DE": "Aktion", + "nl-NL": "Werking", + "da-DK": "Drifttype", + "es-ES": "Modo", + "fr-FR": "Opération", + "it-IT": "Operazione", + "ru-RU": "Режим работы", + "nb-NO": "Operasjon", + "pl-PL": "Tryb pracy", + "pt-PT": "Operação" + } + } +} \ No newline at end of file From b64a0125870bc0bae3519808314abdd10f4b36ad Mon Sep 17 00:00:00 2001 From: Armilar <102996011+Armilar@users.noreply.github.com> Date: Sun, 19 Jun 2022 13:28:50 +0200 Subject: [PATCH 08/13] 3.1.0 Bugfix V3.1.0 - Bugfix toLocalTimeString in en-EN/en-US V3.1.0 - Fixed bug in findLocale V3.1.0 - Conversion to "Home Assistant" language file --- ioBroker/NsPanelTs.ts | 47 ++++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/ioBroker/NsPanelTs.ts b/ioBroker/NsPanelTs.ts index 0fe94669..cd0de7c0 100644 --- a/ioBroker/NsPanelTs.ts +++ b/ioBroker/NsPanelTs.ts @@ -1,6 +1,6 @@ /*----------------------------------------------------------------------- TypeScript zur Steuerung des SONOFF NSPanel mit dem ioBroker -- abgestimmt auf TFT 38 / v3.1.0 / BerryDriver 4 / Tasmota 12.0.0 +- abgestimmt auf TFT 38 / v3.1.0.1 / BerryDriver 4 / Tasmota 12.0.1 joBr99 Projekt: https://github.com/joBr99/nspanel-lovelace-ui/tree/main/ioBroker NsPanelTs.ts (dieses TypeScript in ioBroker) Stable: https://github.com/joBr99/nspanel-lovelace-ui/blob/main/ioBroker/NsPanelTs.ts icon_mapping.ts: https://github.com/joBr99/nspanel-lovelace-ui/blob/main/ioBroker/icon_mapping.ts (TypeScript muss in global liegen) @@ -16,10 +16,13 @@ ReleaseNotes: - 14.06.2022 - V2.9.0 - Aktion auf Submenüs schaltet unmittelbar auf vorheriges Mainmenu (Many thanks to Grrzzz) - 14.06.2022 - V2.9.0 - Menü-Pfeile in Subpages (z.B. card QR, cardMedia, etc) (Many thanks to Grrzzz) - 15.06.2022 - V3.0.0 - Date/Time im Screensaver auf Basis localString (de-DE/en-EN/nl-NL/etc.) - - 16.06.2022 - V3.0.0 - Multilingual - config.locale (en-EN, de-DE, nl-NL, da-DK, es-ES, fr-FR, it-IT, ru-RU) + - 16.06.2022 - V3.0.0 - Multilingual - config.locale (en-EN, de-DE, nl-NL, da-DK, es-ES, fr-FR, it-IT, ru-RU, etc.) - 16.06.2022 - V3.0.0 - Bugfix by Grrzzz - Subpages - 18.06.2022 - V3.1.0 - Längere Textfelder in cardEntities - 18.06.2022 - V3.1.0 - Detail-Page Lights/Shutter hat neuen Parameter "id" + - 19.06.2022 - V3.1.0 - Bugfix toLocalTimeString in en-EN/en-US + - 19.06.2022 - V3.1.0 - Fehler in findLocale abgefangen + - 19.06.2022 - V3.1.0 - Umstellung auf "Home Assistant" Sprachfile Known Bug - Github Issue #286 @@ -96,9 +99,6 @@ const NSPanel_Path = "0_userdata.0.NSPanel.1." const Debug = false; var manually_Update = true; -//const Months = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"]; -//const Days = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"]; - //const Off: RGB = { red: 68, green: 115, blue: 158 }; //Blau-Off const Off: RGB = { red: 253, green: 128, blue: 0 }; //Orange-Off - schönere Farbübergänge const On: RGB = { red: 253, green: 216, blue: 53 }; @@ -451,7 +451,7 @@ export const config: Config = { dimmode: 8, active: 100, //Standard-Brightness TFT screenSaverDoubleClick: false, - locale: "de-DE", //en-EN, de-DE, nl-NL, da-DK, es-ES, fr-FR, it-IT, ru-RU + locale: "en-US", //en-US, de-DE, nl-NL, da-DK, es-ES, fr-FR, it-IT, ru-RU, etc. timeFormat: "%H:%M", //currently not used dateFormat: "%A, %d. %B %Y", //currently not used weatherEntity: "alias.0.Wetter", @@ -983,17 +983,16 @@ function SendDate(): void { function SendTime(): void { var d = new Date(); - var year = d.getFullYear(); - var month = d.getMonth(); - var day = d.getDate(); - var hr = d.getHours(); + var hr = d.getHours().toString(); + var min = d.getMinutes().toString(); - var min = d.getMinutes(); - const date = new Date(year, month, day, hr, min, 1); - - var _SendTime = date.toLocaleTimeString(config.locale, { hour: '2-digit', minute: '2-digit', hour12: false}); - - SendToPanel({ payload: "time~" + _SendTime }); + if (d.getHours() < 10) { + hr = "0" + d.getHours().toString(); + } + if (d.getMinutes() < 10) { + min = "0" + d.getMinutes().toString(); + } + SendToPanel({ payload: "time~" + hr + ":" + min }); } function ScreensaverDimmode() { @@ -1385,12 +1384,18 @@ function findLocale(controlsObject: string, controlsState: string) : string { var locale = config.locale; var strJson = getState(NSPanel_Path + 'NSPanel_locales_json').val; var obj = JSON.parse(strJson); - var strLocale = obj[controlsObject][controlsState][locale]; - if (strLocale != undefined) { - return strLocale; - } else { - return controlsState; + try { + var strLocale = obj[controlsObject][controlsState][locale]; + + if (strLocale != undefined) { + return strLocale; + } else { + return controlsState; + } + } catch (e) { + console.log(e); + return controlsState } } From 2f333de7be93eeb02b1329856854a2b3db6b811c Mon Sep 17 00:00:00 2001 From: Armilar <102996011+Armilar@users.noreply.github.com> Date: Sun, 19 Jun 2022 13:49:54 +0200 Subject: [PATCH 09/13] Update iobroker.py --- HMI/code_gen/localization/iobroker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HMI/code_gen/localization/iobroker.py b/HMI/code_gen/localization/iobroker.py index d5a39c30..18c77a83 100644 --- a/HMI/code_gen/localization/iobroker.py +++ b/HMI/code_gen/localization/iobroker.py @@ -19,7 +19,7 @@ keys = { } -langs = ["en-US", "de-DE", "nl-NL", "da-DK", "es-ES", "fr-FR", "it-IT", "ru-RU", "nb-NO", "pl-PL", "pt-PT"] +langs = ["en-US", "de-DE", "nl-NL", "da-DK", "es-ES", "fr-FR", "it-IT", "ru-RU", "nb-NO", "nn-NO", "pl-PL", "pt-PT", "af-ZA", "ar-SY", "bg-BG", "ca-ES", "cs-CZ", "el-GR", "et-EE", "fa-IR", "fi-FI", "he-IL", "hr-xx", "hu_HU", "hy-AM", "id-ID", "is-IS", "lb-xx", "lt-LT", "ro-RO"] def build_locale_filestring(locale): From 4a7a97eb41365fbacdd59e2bf56156d7811c859d Mon Sep 17 00:00:00 2001 From: Armilar <102996011+Armilar@users.noreply.github.com> Date: Sun, 19 Jun 2022 13:57:08 +0200 Subject: [PATCH 10/13] Update iobroker.py --- HMI/code_gen/localization/iobroker.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/HMI/code_gen/localization/iobroker.py b/HMI/code_gen/localization/iobroker.py index 18c77a83..7c5100e4 100644 --- a/HMI/code_gen/localization/iobroker.py +++ b/HMI/code_gen/localization/iobroker.py @@ -19,7 +19,9 @@ keys = { } -langs = ["en-US", "de-DE", "nl-NL", "da-DK", "es-ES", "fr-FR", "it-IT", "ru-RU", "nb-NO", "nn-NO", "pl-PL", "pt-PT", "af-ZA", "ar-SY", "bg-BG", "ca-ES", "cs-CZ", "el-GR", "et-EE", "fa-IR", "fi-FI", "he-IL", "hr-xx", "hu_HU", "hy-AM", "id-ID", "is-IS", "lb-xx", "lt-LT", "ro-RO"] +langs = ["en-US", "de-DE", "nl-NL", "da-DK", "es-ES", "fr-FR", "it-IT", "ru-RU", "nb-NO", "nn-NO", "pl-PL", "pt-PT", + "af-ZA", "ar-SY", "bg-BG", "ca-ES", "cs-CZ", "el-GR", "et-EE", "fa-IR", "fi-FI", "he-IL", "hr-xx", "hu-HU", + "hy-AM", "id-ID", "is-IS", "lb-xx", "lt-LT", "ro-RO"] def build_locale_filestring(locale): From 4da89b053ae40df920676ef70bf9e9a763204e50 Mon Sep 17 00:00:00 2001 From: Armilar Date: Sun, 19 Jun 2022 11:57:24 +0000 Subject: [PATCH 11/13] Update iobroker localization file --- ioBroker/ioBroker_NSPanel_locales.json | 367 ++++++++++++++++++++++++- 1 file changed, 355 insertions(+), 12 deletions(-) diff --git a/ioBroker/ioBroker_NSPanel_locales.json b/ioBroker/ioBroker_NSPanel_locales.json index b429a440..9807327b 100644 --- a/ioBroker/ioBroker_NSPanel_locales.json +++ b/ioBroker/ioBroker_NSPanel_locales.json @@ -10,8 +10,27 @@ "it-IT": "Luminosità", "ru-RU": "Яркость", "nb-NO": "Lysstyrke", + "nn-NO": "Lysstyrke", "pl-PL": "Jasność", - "pt-PT": "Brilho" + "pt-PT": "Brilho", + "af-ZA": "Helderheid", + "ar-SY": "السطوع", + "bg-BG": "Яркост", + "ca-ES": "Brillantor", + "cs-CZ": "Jas", + "el-GR": "Φωτεινότητα", + "et-EE": "Heledus", + "fa-IR": "روشنایی", + "fi-FI": "Kirkkaus", + "he-IL": "בהירות", + "hr-xx": "Svjetlina", + "hu-HU": "Fényerő", + "hy-AM": "Պայծառություն", + "id-ID": "Kecerahan", + "is-IS": "Birtustig", + "lb-xx": "Hellegkeet", + "lt-LT": "Ryškumas", + "ro-RO": "Luminozitate" }, "Temperature": { "en-US": "Color temperature", @@ -23,8 +42,27 @@ "it-IT": "Temperatura colore", "ru-RU": "Цветовая температура", "nb-NO": "Fargetemperatur", + "nn-NO": "Fargetemperatur", "pl-PL": "Temperatura barwy", - "pt-PT": "Temperatura de cor" + "pt-PT": "Temperatura de cor", + "af-ZA": "Kleur temperatuur", + "ar-SY": "درجة حرارة اللون", + "bg-BG": "Цветова температура", + "ca-ES": "Temperatura de color", + "cs-CZ": "Teplota barvy", + "el-GR": "Θερμοκρασία χρώματος", + "et-EE": "Värvustemperatuur", + "fa-IR": "دمای رنگ", + "fi-FI": "Värilämpötila", + "he-IL": "טמפרטורת הצבע", + "hr-xx": "Temperatura boje", + "hu-HU": "Színhőmérséklet", + "hy-AM": "Գունային ջերմաստիճան", + "id-ID": "Temperatur warna", + "is-IS": "Litastig", + "lb-xx": "Faarf Temperatur", + "lt-LT": "Spalvos temperatūra", + "ro-RO": "Temperatură de culoare" } }, "window": { @@ -38,8 +76,27 @@ "it-IT": "Chiusa", "ru-RU": "Закрыто", "nb-NO": "Lukket", + "nn-NO": "Lukka", "pl-PL": "zamknięte", - "pt-PT": "Fechada" + "pt-PT": "Fechada", + "af-ZA": "Toe", + "ar-SY": "مغلق", + "bg-BG": "Затворен", + "ca-ES": "Tancada", + "cs-CZ": "Zavřeno", + "el-GR": "Κλειστό", + "et-EE": "Suletud", + "fa-IR": "بسته", + "fi-FI": "Suljettu", + "he-IL": "סגור", + "hr-xx": "Zatvoreno", + "hu-HU": "Zárva", + "hy-AM": "Փակված է", + "id-ID": "Tertutup", + "is-IS": "Loka", + "lb-xx": "Zou", + "lt-LT": "Uždaryta", + "ro-RO": "Închis" }, "opened": { "en-US": "Open", @@ -51,8 +108,27 @@ "it-IT": "Aperta", "ru-RU": "Открыто", "nb-NO": "Åpent", + "nn-NO": "Open", "pl-PL": "otwarte", - "pt-PT": "Aberta" + "pt-PT": "Aberta", + "af-ZA": "Oop", + "ar-SY": "مفتوح", + "bg-BG": "Отворен", + "ca-ES": "Oberta", + "cs-CZ": "Otevřeno", + "el-GR": "Ανοιχτό", + "et-EE": "Avatud", + "fa-IR": "باز", + "fi-FI": "Auki", + "he-IL": "פתוח", + "hr-xx": "Otvoreno", + "hu-HU": "Nyitva", + "hy-AM": "Բացել", + "id-ID": "Terbuka", + "is-IS": "Opna", + "lb-xx": "Op", + "lt-LT": "Atidaryta", + "ro-RO": "Deschis" } }, "door": { @@ -66,8 +142,27 @@ "it-IT": "Chiusa", "ru-RU": "Закрыта", "nb-NO": "Lukket", + "nn-NO": "Lukka", "pl-PL": "zamknięte", - "pt-PT": "Fechada" + "pt-PT": "Fechada", + "af-ZA": "Toe", + "ar-SY": "مغلق", + "bg-BG": "Затворена", + "ca-ES": "Tancada", + "cs-CZ": "Zavřeno", + "el-GR": "Κλειστή", + "et-EE": "Suletud", + "fa-IR": "بسته", + "fi-FI": "Suljettu", + "he-IL": "סגורה", + "hr-xx": "Zatvoreno", + "hu-HU": "Zárva", + "hy-AM": "Փակված է", + "id-ID": "Tertutup", + "is-IS": "Lokuð", + "lb-xx": "Zou", + "lt-LT": "Uždaryta", + "ro-RO": "Închis" }, "opened": { "en-US": "Open", @@ -79,8 +174,27 @@ "it-IT": "Aperta", "ru-RU": "Открыта", "nb-NO": "Åpen", + "nn-NO": "Open", "pl-PL": "otwarte", - "pt-PT": "Aberta" + "pt-PT": "Aberta", + "af-ZA": "Oop", + "ar-SY": "مفتوح", + "bg-BG": "Отворена", + "ca-ES": "Oberta", + "cs-CZ": "Otevřeno", + "el-GR": "Ανοιχτή", + "et-EE": "Avatud", + "fa-IR": "باز", + "fi-FI": "Auki", + "he-IL": "פתוחה", + "hr-xx": "Otvori", + "hu-HU": "Nyitva", + "hy-AM": "Բացել", + "id-ID": "Terbuka", + "is-IS": "Opin", + "lb-xx": "Op", + "lt-LT": "Atidaryta", + "ro-RO": "Deschis" } }, "lock": { @@ -94,8 +208,27 @@ "it-IT": "Blocca", "ru-RU": "Закрыть", "nb-NO": "Lås", + "nn-NO": "Lås", "pl-PL": "Zablokuj", - "pt-PT": "Bloquear" + "pt-PT": "Bloquear", + "af-ZA": "Sluit toe", + "ar-SY": "قفل", + "bg-BG": "Заключване", + "ca-ES": "Bloquejar", + "cs-CZ": "Zamknout", + "el-GR": "Κλείδωμα", + "et-EE": "Lukusta", + "fa-IR": "قفل", + "fi-FI": "Lukitse", + "he-IL": "נעילה", + "hr-xx": "zaključati", + "hu-HU": "Bezár", + "hy-AM": "Կողպեք", + "id-ID": "Kunci", + "is-IS": "Læsa", + "lb-xx": "Spären", + "lt-LT": "Užrakinti", + "ro-RO": "Blocat" }, "UNLOCK": { "en-US": "Unlock", @@ -107,8 +240,27 @@ "it-IT": "Sblocca", "ru-RU": "Открыть", "nb-NO": "Lås opp", + "nn-NO": "Lås opp", "pl-PL": "Odblokuj", - "pt-PT": "Desbloquear" + "pt-PT": "Desbloquear", + "af-ZA": "Sluit oop", + "ar-SY": "فتح", + "bg-BG": "Отключване", + "ca-ES": "Desbloquejar", + "cs-CZ": "Odemknout", + "el-GR": "Ξεκλείδωμα", + "et-EE": "Ava", + "fa-IR": "باز کردن", + "fi-FI": "Avaa lukitus", + "he-IL": "ביטול נעילה", + "hr-xx": "Otključati", + "hu-HU": "Kinyit", + "hy-AM": "Բացել", + "id-ID": "Buka", + "is-IS": "Aflæsa", + "lb-xx": "Entspären", + "lt-LT": "Atrakinti", + "ro-RO": "Deblocare" } }, "blinds": { @@ -122,8 +274,27 @@ "it-IT": "Apertura", "ru-RU": "Положение", "nb-NO": "Posisjon", + "nn-NO": "Posisjon", "pl-PL": "Pozycja", - "pt-PT": "Posição" + "pt-PT": "Posição", + "af-ZA": "Posisie", + "ar-SY": "موضع", + "bg-BG": "Позиция", + "ca-ES": "Posició", + "cs-CZ": "Pozice", + "el-GR": "Θέση", + "et-EE": "Asend", + "fa-IR": "موقعیت", + "fi-FI": "Sijainti", + "he-IL": "מיקום", + "hr-xx": "Pozicija", + "hu-HU": "Pozíció", + "hy-AM": "Դիրք", + "id-ID": "Posisi", + "is-IS": "Staðsetning", + "lb-xx": "Positioun", + "lt-LT": "Padėtis", + "ro-RO": "Poziţie" } }, "thermostat": { @@ -137,8 +308,27 @@ "it-IT": "Attualmente", "ru-RU": "Сейчас", "nb-NO": "Er nå", + "nn-NO": "Akkurat no", "pl-PL": "Obecnie", - "pt-PT": "Atualmente" + "pt-PT": "Atualmente", + "af-ZA": "Tans", + "ar-SY": "حاليا", + "bg-BG": "В момента", + "ca-ES": "Actual", + "cs-CZ": "Aktuálně", + "el-GR": "Αυτή τη στιγμή", + "et-EE": "Hetkel", + "fa-IR": "در حال حاضر", + "fi-FI": "Tällä hetkellä", + "he-IL": "כעת", + "hr-xx": "Trenutno", + "hu-HU": "Jelenleg", + "hy-AM": "Ներկայումս", + "id-ID": "Saat ini", + "is-IS": "Er núna", + "lb-xx": "Momentan", + "lt-LT": "Šiuo metu", + "ro-RO": "În prezent" }, "State": { "en-US": "State", @@ -150,8 +340,142 @@ "it-IT": "Stato", "ru-RU": "Состояние", "nb-NO": "Tilstand", + "nn-NO": "Tilstand", "pl-PL": "Stan", - "pt-PT": "Estado" + "pt-PT": "Estado", + "af-ZA": { + "add_entities_lovelace": "Voeg by Lovelace", + "entities": "Entiteite", + "none": "Hierdie toestel het geen entiteite nie" + }, + "ar-SY": { + "add_entities_lovelace": "أضف إلى Lovelace", + "disabled_entities": "{count} {count, plural,\n one {كيان}\n other {كيانات}\n}", + "entities": "الكيانات", + "hide_disabled": "إخفاء معطل", + "none": "هذا الجهاز ليس له كيانات" + }, + "bg-BG": { + "add_entities_lovelace": "Добавете към Lovelace", + "config": "Конфиг.", + "control": "Контроли", + "diagnostic": "Диагностика", + "disabled_entities": "+{count} {count, plural,\n one {деактивиран обект}\n other {деактивирани обекта}\n}", + "entities": "Обекти", + "hide_disabled": "Скриване на деактивираните", + "none": "Това устройство няма обекти", + "sensor": "Сензори" + }, + "ca-ES": "Estat", + "cs-CZ": "Stav", + "el-GR": "Κατάσταση", + "et-EE": "Olek", + "fa-IR": { + "add_entities_lovelace": "Adauga la Lovelace", + "entities": "Entitati", + "none": "Acest dispozitiv nu are nicio entitate" + }, + "fi-FI": "Tila", + "he-IL": "מצב", + "hr-xx": { + "automation": { + "actions": { + "caption": "Kada se nešto pokrene…" + }, + "automations": "Automatizacije", + "conditions": { + "caption": "Učini nešto samo ako…" + }, + "create": "Stvorite automatizaciju s uređajem", + "no_automations": "Nema automatizacije", + "no_device_automations": "Nema dostupnih automatizacija za ovaj uređaj.", + "triggers": { + "caption": "Učini nešto kad..." + } + }, + "cant_edit": "Možete uređivati samo stavke stvorene u korisničkom sučelju (UI).", + "caption": "Uređaji", + "confirm_rename_entity_ids": "Želite li također preimenovati ID entiteta svojih entiteta?", + "data_table": { + "area": "Područje", + "battery": "Baterija", + "device": "Uređaj", + "integration": "Integracija", + "manufacturer": "Proizvođač", + "model": "Model" + }, + "description": "Upravljanje povezanim uređajima", + "device_not_found": "Uređaj nije pronađen.", + "name": "Naziv", + "scene": { + "create": "Stvorite scenu s uređajem", + "no_scenes": "Nema scena", + "scenes": "Scene" + }, + "scenes": "Scene", + "script": { + "create": "Stvorite skriptu s uređajem", + "no_scripts": "Nema skripte", + "scripts": "Skripte" + }, + "scripts": "Skripte", + "unknown_error": "Nepoznata pogreška", + "unnamed_device": "Neimenovani uređaj", + "update": "Ažuriraj" + }, + "hu-HU": "Állapot", + "hy-AM": { + "automation": { + "create_disable": "Հնարավոր չէ ստեղծել ավտոմատացում անջատված սարքով" + }, + "disabled": "Անջատված", + "disabled_by": { + "config_entry": "Կարգավորման կետ", + "integration": "Ինտեգրում", + "user": "Օգտատեր" + }, + "enabled_cause": "Անջատված է {cause}-ի կողմից", + "enabled_label": "Միացնել սարքը", + "picker": { + "filter": { + "filter": "Ֆիլտր", + "show_all": "Ցույց տալ ամբողջը", + "show_disabled": "Ցուցադրել ապաակտիվացված սարքերը" + }, + "search": "Որոնել սարքեր" + }, + "scene": { + "create_disable": "Հնարավոր չէ սցենար ստեղծել անջատված սարքով" + }, + "script": { + "create_disable": "Անջատված սարքով հնարավոր չէ ստեղծել սկրիպտ" + } + }, + "id-ID": "Status", + "is-IS": "Staða", + "lb-xx": { + "add_entities_lovelace": "Zu Lovelace bäisetzen", + "disabled_entities": "+{count} {count, plural,\n one {Déaktivéiert Entitéit}\n other {Déaktivéiert Entitéiten}\n}", + "entities": "Entitéiten", + "hide_disabled": "Deaktivéiert net uweisen", + "none": "Dësen Appart huet keng Entitéiten." + }, + "lt-LT": { + "add_entities_lovelace": "Pridėti į Lovelace", + "config": "Konfigūracija", + "control": "Valdikliai", + "diagnostic": "Diagnostika", + "entities": "Subjektai", + "sensor": "Jutikliai" + }, + "ro-RO": { + "add_entities_lovelace": "Adăugați la Lovelace", + "disabled_entities": "+{count} {count, plural,\n one {entitate dezactivată}\n other {entități dezactivate}\n}", + "entities": "Entități", + "hide_disabled": "Ascundeți dezactivate", + "none": "Acest dispozitiv nu are entități", + "sensor": "Senzori" + } }, "Action": { "en-US": "Operation", @@ -163,8 +487,27 @@ "it-IT": "Operazione", "ru-RU": "Режим работы", "nb-NO": "Operasjon", + "nn-NO": "Operasjon", "pl-PL": "Tryb pracy", - "pt-PT": "Operação" + "pt-PT": "Operação", + "af-ZA": "Operasie", + "ar-SY": "الوضع", + "bg-BG": "Режим", + "ca-ES": "Funcionament", + "cs-CZ": "Provoz", + "el-GR": "Λειτουργία", + "et-EE": "Töörežiim", + "fa-IR": "عملیات", + "fi-FI": "Toiminto", + "he-IL": "פעולה", + "hr-xx": "operacija", + "hu-HU": "Működés", + "hy-AM": "Գործողություն", + "id-ID": "Operasi", + "is-IS": "Aðgerð", + "lb-xx": "Aktioun", + "lt-LT": "Operacija", + "ro-RO": "Operație" } } } \ No newline at end of file From c67af4dab16a8d326915babfc503103d4fa51079 Mon Sep 17 00:00:00 2001 From: Armilar <102996011+Armilar@users.noreply.github.com> Date: Sun, 19 Jun 2022 14:02:07 +0200 Subject: [PATCH 12/13] Update iobroker.py --- HMI/code_gen/localization/iobroker.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/HMI/code_gen/localization/iobroker.py b/HMI/code_gen/localization/iobroker.py index 7c5100e4..b6dcb74d 100644 --- a/HMI/code_gen/localization/iobroker.py +++ b/HMI/code_gen/localization/iobroker.py @@ -21,7 +21,8 @@ keys = { langs = ["en-US", "de-DE", "nl-NL", "da-DK", "es-ES", "fr-FR", "it-IT", "ru-RU", "nb-NO", "nn-NO", "pl-PL", "pt-PT", "af-ZA", "ar-SY", "bg-BG", "ca-ES", "cs-CZ", "el-GR", "et-EE", "fa-IR", "fi-FI", "he-IL", "hr-xx", "hu-HU", - "hy-AM", "id-ID", "is-IS", "lb-xx", "lt-LT", "ro-RO"] + "hy-AM", "id-ID", "is-IS", "lb-xx", "lt-LT", "ro-RO", "sk-SK", "sl-SI", "sv-SE", "th-TH", "tr-TR", "uk-UA", + "vi-VN", "zh-CN", "zh-TW"] def build_locale_filestring(locale): From 7576c0d9b14ad70c0e3c71f2cce827e40816b8ba Mon Sep 17 00:00:00 2001 From: Armilar Date: Sun, 19 Jun 2022 12:02:25 +0000 Subject: [PATCH 13/13] Update iobroker localization file --- ioBroker/ioBroker_NSPanel_locales.json | 138 ++++++++++++++++++++++--- 1 file changed, 126 insertions(+), 12 deletions(-) diff --git a/ioBroker/ioBroker_NSPanel_locales.json b/ioBroker/ioBroker_NSPanel_locales.json index 9807327b..d1d87656 100644 --- a/ioBroker/ioBroker_NSPanel_locales.json +++ b/ioBroker/ioBroker_NSPanel_locales.json @@ -30,7 +30,16 @@ "is-IS": "Birtustig", "lb-xx": "Hellegkeet", "lt-LT": "Ryškumas", - "ro-RO": "Luminozitate" + "ro-RO": "Luminozitate", + "sk-SK": "Jas", + "sl-SI": "Svetlost", + "sv-SE": "Ljusstyrka", + "th-TH": "ความสว่าง", + "tr-TR": "Parlaklık", + "uk-UA": "Яскравість", + "vi-VN": "Độ sáng", + "zh-CN": "亮度", + "zh-TW": "亮度" }, "Temperature": { "en-US": "Color temperature", @@ -62,7 +71,16 @@ "is-IS": "Litastig", "lb-xx": "Faarf Temperatur", "lt-LT": "Spalvos temperatūra", - "ro-RO": "Temperatură de culoare" + "ro-RO": "Temperatură de culoare", + "sk-SK": "Teplota farby", + "sl-SI": "Temperatura barve", + "sv-SE": "Färgtemperatur", + "th-TH": "อุณหภูมิสี", + "tr-TR": "Renk sıcaklığı", + "uk-UA": "Кольорова температура", + "vi-VN": "Nhiệt độ màu", + "zh-CN": "色温", + "zh-TW": "色溫" } }, "window": { @@ -96,7 +114,16 @@ "is-IS": "Loka", "lb-xx": "Zou", "lt-LT": "Uždaryta", - "ro-RO": "Închis" + "ro-RO": "Închis", + "sk-SK": "Zatvorené", + "sl-SI": "Zaprto", + "sv-SE": "Stängt", + "th-TH": "ปิดแล้ว", + "tr-TR": "Kapalı", + "uk-UA": "Зачинене", + "vi-VN": "Đóng", + "zh-CN": "关闭", + "zh-TW": "關閉" }, "opened": { "en-US": "Open", @@ -128,7 +155,16 @@ "is-IS": "Opna", "lb-xx": "Op", "lt-LT": "Atidaryta", - "ro-RO": "Deschis" + "ro-RO": "Deschis", + "sk-SK": "Otvorené", + "sl-SI": "Odprto", + "sv-SE": "Öppet", + "th-TH": "เปิด", + "tr-TR": "Açık", + "uk-UA": "Відчинене", + "vi-VN": "Mở", + "zh-CN": "开启", + "zh-TW": "開啟" } }, "door": { @@ -162,7 +198,16 @@ "is-IS": "Lokuð", "lb-xx": "Zou", "lt-LT": "Uždaryta", - "ro-RO": "Închis" + "ro-RO": "Închis", + "sk-SK": "Zatvorené", + "sl-SI": "Zaprto", + "sv-SE": "Stängd", + "th-TH": "ปิดแล้ว", + "tr-TR": "Kapalı", + "uk-UA": "Зачинені", + "vi-VN": "Đóng", + "zh-CN": "关闭", + "zh-TW": "已關閉" }, "opened": { "en-US": "Open", @@ -194,7 +239,16 @@ "is-IS": "Opin", "lb-xx": "Op", "lt-LT": "Atidaryta", - "ro-RO": "Deschis" + "ro-RO": "Deschis", + "sk-SK": "Otvorené", + "sl-SI": "Odprto", + "sv-SE": "Öppen", + "th-TH": "เปิด", + "tr-TR": "Açık", + "uk-UA": "Відчинені", + "vi-VN": "Mở", + "zh-CN": "开启", + "zh-TW": "已開啟" } }, "lock": { @@ -228,7 +282,16 @@ "is-IS": "Læsa", "lb-xx": "Spären", "lt-LT": "Užrakinti", - "ro-RO": "Blocat" + "ro-RO": "Blocat", + "sk-SK": "Zamknúť", + "sl-SI": "Zakleni", + "sv-SE": "Lås", + "th-TH": "ล็อค", + "tr-TR": "Kilitle", + "uk-UA": "Блокувати", + "vi-VN": "Khóa", + "zh-CN": "锁定", + "zh-TW": "上鎖" }, "UNLOCK": { "en-US": "Unlock", @@ -260,7 +323,16 @@ "is-IS": "Aflæsa", "lb-xx": "Entspären", "lt-LT": "Atrakinti", - "ro-RO": "Deblocare" + "ro-RO": "Deblocare", + "sk-SK": "Odomknúť", + "sl-SI": "Odkleni", + "sv-SE": "Lås upp", + "th-TH": "ปลดล็อค", + "tr-TR": "Kilidi aç", + "uk-UA": "Розблокувати", + "vi-VN": "Mở khóa", + "zh-CN": "解锁", + "zh-TW": "解鎖" } }, "blinds": { @@ -294,7 +366,16 @@ "is-IS": "Staðsetning", "lb-xx": "Positioun", "lt-LT": "Padėtis", - "ro-RO": "Poziţie" + "ro-RO": "Poziţie", + "sk-SK": "Poloha", + "sl-SI": "Položaj", + "sv-SE": "Position", + "th-TH": "ตำแหน่ง", + "tr-TR": "Pozisyon", + "uk-UA": "Положення", + "vi-VN": "Vị trí", + "zh-CN": "位置", + "zh-TW": "位置" } }, "thermostat": { @@ -328,7 +409,16 @@ "is-IS": "Er núna", "lb-xx": "Momentan", "lt-LT": "Šiuo metu", - "ro-RO": "În prezent" + "ro-RO": "În prezent", + "sk-SK": "Aktuálne", + "sl-SI": "Trenutno", + "sv-SE": "Nuvarande", + "th-TH": "ในขณะนี้", + "tr-TR": "Şu an", + "uk-UA": "В даний час", + "vi-VN": "Hiện tại", + "zh-CN": "当前", + "zh-TW": "目前狀態" }, "State": { "en-US": "State", @@ -475,7 +565,22 @@ "hide_disabled": "Ascundeți dezactivate", "none": "Acest dispozitiv nu are entități", "sensor": "Senzori" - } + }, + "sk-SK": "Stav", + "sl-SI": "Stanje", + "sv-SE": "Tillstånd", + "th-TH": "สถานะ", + "tr-TR": "Durum", + "uk-UA": "Стан", + "vi-VN": { + "add_entities_lovelace": "Thêm vào Lovelace", + "disabled_entities": "+{count} {count, plural,\n one {thực thể bị vô hiệu hoá}\n other {các thực thể bị vô hiệu hoá}\n}", + "entities": "Các thực thể", + "hide_disabled": "Ẩn các thiết bị bị vô hiệu hoá", + "none": "Thiết bị này không có thực thể nào" + }, + "zh-CN": "状态", + "zh-TW": "狀態" }, "Action": { "en-US": "Operation", @@ -507,7 +612,16 @@ "is-IS": "Aðgerð", "lb-xx": "Aktioun", "lt-LT": "Operacija", - "ro-RO": "Operație" + "ro-RO": "Operație", + "sk-SK": "Prevádzka", + "sl-SI": "Delovanje", + "sv-SE": "Driftläge", + "th-TH": "การทำงาน", + "tr-TR": "İşlem", + "uk-UA": "Режим", + "vi-VN": "Chế độ hoạt động", + "zh-CN": "运行模式", + "zh-TW": "運轉模式" } } } \ No newline at end of file