From d395e0a3b1de9b765dd0bdc2b30f1395a806951d Mon Sep 17 00:00:00 2001 From: LordGrey <48840279+Lord-Grey@users.noreply.github.com> Date: Thu, 18 Nov 2021 20:48:11 +0000 Subject: [PATCH] New languages - Danish & Hungarian (#1376) * New languages, Danish and Hungarian * Yeelight Wizard - Ensure correct hostname --- CHANGELOG.md | 1 + assets/webconfig/i18n/da.json | 44 ++++++++++++++++ assets/webconfig/i18n/en.json | 2 + assets/webconfig/i18n/hu.json | 86 ++++++++++++++++++++++++++++++++ assets/webconfig/js/languages.js | 4 +- assets/webconfig/js/wizard.js | 8 +++ 6 files changed, 143 insertions(+), 2 deletions(-) create mode 100644 assets/webconfig/i18n/da.json create mode 100644 assets/webconfig/i18n/hu.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f38c07f..16b076ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - hyperion-remote & standalone grabbers: IPv6 support +- New languages - Danish & Hungarian ### Changed diff --git a/assets/webconfig/i18n/da.json b/assets/webconfig/i18n/da.json new file mode 100644 index 00000000..f0cb5722 --- /dev/null +++ b/assets/webconfig/i18n/da.json @@ -0,0 +1,44 @@ +{ + "general_access_advanced": "Avanceret ", + "general_access_default": "Default", + "general_access_expert": "Ekspert", + "general_btn_back": "Tilbage", + "general_btn_cancel": "Annullere", + "general_btn_continue": "Fortsæt", + "general_btn_iswitch": "Skift", + "general_btn_next": "Næste", + "general_btn_off": "Fra", + "general_btn_ok": "OK", + "general_btn_on": "Til", + "general_btn_restarthyperion": "Genstart Hyperion", + "general_btn_save": "Gem", + "general_btn_saveandreload": "Gem og genindlæs", + "general_btn_yes": "Ja", + "general_button_savesettings": "Gem indstillinger", + "general_col_blue": "blå", + "general_col_green": "grøn", + "general_col_red": "rød", + "general_comp_BLACKBORDER": "Blackbar Detektion", + "general_comp_BOBLIGHTSERVER": "Boblight Server", + "general_comp_FLATBUFSERVER": "Flatbuffers Server", + "general_comp_FORWARDER": "Forwarder", + "general_comp_GRABBER": "Skærm optager", + "general_comp_LEDDEVICE": "LED enhed", + "general_comp_PROTOSERVER": "Protocol Buffers Server", + "general_comp_SMOOTHING": "Udjævning", + "general_comp_V4L": "USB optager", + "general_country_de": "Tyskland", + "general_country_es": "Spanien", + "general_country_fr": "Frankrig", + "general_country_it": "Italien", + "general_country_nl": "Holland", + "general_country_uk": "United Kingdom", + "general_country_us": "United States", + "general_speech_cs": "Tjekkisk", + "general_speech_de": "Tysk", + "general_speech_en": "Engelsk", + "general_speech_es": "Spansk", + "general_speech_it": "Italiensk", + "general_webui_title": "Hyperion - Webkonfiguration", + "general_wiki_moreto": "Mere information om \"$1\" på Wiki" +} \ No newline at end of file diff --git a/assets/webconfig/i18n/en.json b/assets/webconfig/i18n/en.json index 32a37f67..ff707da7 100644 --- a/assets/webconfig/i18n/en.json +++ b/assets/webconfig/i18n/en.json @@ -820,10 +820,12 @@ "general_disabled": "disabled", "general_enabled": "enabled", "general_speech_cs": "Czech", + "general_speech_da": "Danish", "general_speech_de": "German", "general_speech_en": "English", "general_speech_es": "Spanish", "general_speech_fr": "French", + "general_speech_hu": "Hungarian", "general_speech_it": "Italian", "general_speech_nb": "Norwegian (Bokmål)", "general_speech_nl": "Dutch", diff --git a/assets/webconfig/i18n/hu.json b/assets/webconfig/i18n/hu.json new file mode 100644 index 00000000..3b6afb6f --- /dev/null +++ b/assets/webconfig/i18n/hu.json @@ -0,0 +1,86 @@ +{ + "conf_general_impexp_expbtn": "Export", + "conf_general_impexp_impbtn": "Import", + "conf_general_impexp_title": "Import/Export konfiguráció", + "conf_general_label_title": "Általános beállítások", + "conf_helptable_expl": "Magyarázat", + "conf_leds_layout_advanced": "Haladó beállítások", + "conf_leds_layout_button_savelay": "Elrendezés mentése", + "conf_leds_layout_button_updsim": "Előnézet frissítése", + "conf_leds_layout_cl_bottom": "Alsó", + "conf_leds_layout_cl_left": "Bal", + "conf_leds_layout_cl_right": "Jobb", + "conf_leds_layout_cl_top": "Felső", + "conf_leds_layout_frame": "Klasszikus elrendezés (LED keret)", + "conf_leds_layout_generatedconf": "Generált/Aktuális LED konfiguráció", + "conf_leds_layout_matrix": "Mátrix elrendezés (LED fal)", + "conf_leds_layout_peview": "LED elrendezés előnézet", + "conf_leds_layout_preview_totalleds": "Össze LED: $1", + "conf_leds_nav_label_ledcontroller": "LED vezérlő", + "conf_leds_nav_label_ledlayout": "LED elrendezés", + "conf_leds_optgroup_network": "Hálózat", + "conf_leds_optgroup_usb": "USB/Soros", + "dashboard_alert_message_confsave_success_t": "Konfiguráció mentve", + "dashboard_componentbox_label_comp": "Komponens", + "dashboard_componentbox_label_status": "Státusz", + "dashboard_componentbox_label_title": "Komponens státusz", + "dashboard_infobox_label_platform": "Platform:", + "dashboard_infobox_label_ports": "Portok", + "dashboard_infobox_label_statush": "Hyperion státusz:", + "dashboard_infobox_label_title": "Információ", + "dashboard_infobox_message_updatewarning": "Új Hyperion verzió elérhető ($1)", + "dashboard_newsbox_label_title": "Hyperion-Blog", + "general_access_advanced": "Haladó", + "general_access_default": "Alapméretezett", + "general_access_expert": "Expert", + "general_btn_back": "Vissza", + "general_btn_cancel": "Mégse", + "general_btn_continue": "Tovább", + "general_btn_iswitch": "Kapcsol", + "general_btn_next": "Következő", + "general_btn_off": "Ki", + "general_btn_ok": "OK", + "general_btn_on": "Be", + "general_btn_restarthyperion": "Hyperion újraindítás", + "general_btn_save": "Mentés", + "general_btn_saveandreload": "Mentés és újratöltés", + "general_btn_yes": "Igen", + "general_button_savesettings": "Beállítások mentése", + "general_col_blue": "kék", + "general_col_green": "zöld", + "general_col_red": "piros", + "general_comp_BLACKBORDER": "Fekete sáv észlelő", + "general_comp_BOBLIGHTSERVER": "Boblight Szerver", + "general_comp_FLATBUFSERVER": "Flatbuffers Szerver", + "general_comp_FORWARDER": "Továbbító", + "general_comp_GRABBER": "Képernyő rögzítése", + "general_comp_LEDDEVICE": "LED kimenet", + "general_comp_PROTOSERVER": "Protokol Buffer Szerver", + "general_comp_SMOOTHING": "Simítás", + "general_comp_V4L": "Rögzítés USB-bemenetről", + "general_country_de": "Németország", + "general_country_es": "Spanyolország", + "general_country_fr": "Franciaország", + "general_country_it": "Olaszország", + "general_country_nl": "Hollandia", + "general_country_uk": "Egyesült Királyság", + "general_country_us": "Egyesült Államok", + "general_speech_cs": "Cseh", + "general_speech_de": "Német", + "general_speech_en": "Angol", + "general_speech_es": "Spanyol", + "general_speech_it": "Olasz", + "general_webui_title": "Hyperion - Web Konfiguráció", + "main_ledsim_btn_togglelednumber": "LED számok", + "main_ledsim_btn_togglelivevideo": "Élő videó", + "main_ledsim_title": "LED vizualizáció", + "main_menu_colors_conf_token": "Kép feldolgozás", + "main_menu_general_conf_token": "Általános", + "main_menu_input_selection_token": "Bemenet kiválasztása", + "main_menu_leds_conf_token": "LED Kimenet", + "main_menu_logging_token": "Napló", + "main_menu_network_conf_token": "Hálózati szolgáltatások", + "main_menu_system_token": "Rendszer", + "main_menu_update_token": "Frissítés", + "main_menu_webconfig_token": "Web konfiguráció" +} \ No newline at end of file diff --git a/assets/webconfig/js/languages.js b/assets/webconfig/js/languages.js index b455ba96..4ac2cf7b 100644 --- a/assets/webconfig/js/languages.js +++ b/assets/webconfig/js/languages.js @@ -1,6 +1,6 @@ var storedLang; -var availLang = ['cs', 'de', 'en', 'es', 'fr', 'it', 'nl', 'nb', 'pl', 'pt', 'ro', 'sv', 'vi', 'ru', 'tr', 'zh-CN']; -var availLangText = ['Čeština', 'Deutsch', 'English', 'Español', 'Français', 'Italiano', 'Nederlands', 'Norsk Bokmål', 'Polski', 'Português', 'Română', 'Svenska', 'Tiếng Việt', 'русский', 'Türkçe', '汉语']; +var availLang = ['cs', 'da', 'de', 'en', 'es', 'fr', 'hu', 'it', 'nl', 'nb', 'pl', 'pt', 'ro', 'sv', 'vi', 'ru', 'tr', 'zh-CN']; +var availLangText = ['Čeština', 'Dansk', 'Deutsch', 'English', 'Español', 'Français', 'Magyar', 'Italiano', 'Nederlands', 'Norsk Bokmål', 'Polski', 'Português', 'Română', 'Svenska', 'Tiếng Việt', 'русский', 'Türkçe', '汉语']; //$.i18n.debug = true; diff --git a/assets/webconfig/js/wizard.js b/assets/webconfig/js/wizard.js index 5d2bed58..3fdf9a4d 100755 --- a/assets/webconfig/js/wizard.js +++ b/assets/webconfig/js/wizard.js @@ -1483,7 +1483,15 @@ async function discover_yeelight_lights() { if (device.hostname !== "") { if (getHostInLights(device.hostname).length === 0) { var light = {}; + light.host = device.hostname; + + //Create a valid hostname + if (device.domain) + { + light.host += '.' + device.domain; + } + light.port = device.port; if (device.txt) {