From 50614a18b5c45a79c3d449df24c2d5e4c7f9fb16 Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Tue, 5 May 2020 17:09:48 +0200 Subject: [PATCH] Rename language files to fix compilation error --- BUILDS.md | 2 +- platformio_tasmota_env.ini | 44 ++++++++++++------------- platformio_tasmota_env32.ini | 44 ++++++++++++------------- tasmota/i18n.h | 4 +-- tasmota/language/{bg-BG.h => bg_BG.h} | 0 tasmota/language/{cs-CZ.h => cs_CZ.h} | 0 tasmota/language/{de-DE.h => de_DE.h} | 0 tasmota/language/{el-GR.h => el_GR.h} | 0 tasmota/language/{en-GB.h => en_GB.h} | 0 tasmota/language/{es-ES.h => es_ES.h} | 0 tasmota/language/{fr-FR.h => fr_FR.h} | 0 tasmota/language/{he-HE.h => he_HE.h} | 0 tasmota/language/{hu-HU.h => hu_HU.h} | 0 tasmota/language/{it-IT.h => it_IT.h} | 0 tasmota/language/{ko-KO.h => ko_KO.h} | 0 tasmota/language/{nl-NL.h => nl_NL.h} | 0 tasmota/language/{pl-PL.h => pl_PL.h} | 0 tasmota/language/{pt-BR.h => pt_BR.h} | 0 tasmota/language/{pt-PT.h => pt_PT.h} | 0 tasmota/language/{ro-RO.h => ro_RO.h} | 0 tasmota/language/{ru-RU.h => ru_RU.h} | 0 tasmota/language/{sk-SK.h => sk_SK.h} | 0 tasmota/language/{sv-SE.h => sv_SE.h} | 0 tasmota/language/{tr-TR.h => tr_TR.h} | 0 tasmota/language/{uk-UA.h => uk_UA.h} | 0 tasmota/language/{zh-CN.h => zh_CN.h} | 0 tasmota/language/{zh-TW.h => zh_TW.h} | 0 tasmota/my_user_config.h | 46 +++++++++++++-------------- 28 files changed, 70 insertions(+), 70 deletions(-) rename tasmota/language/{bg-BG.h => bg_BG.h} (100%) rename tasmota/language/{cs-CZ.h => cs_CZ.h} (100%) rename tasmota/language/{de-DE.h => de_DE.h} (100%) rename tasmota/language/{el-GR.h => el_GR.h} (100%) rename tasmota/language/{en-GB.h => en_GB.h} (100%) rename tasmota/language/{es-ES.h => es_ES.h} (100%) rename tasmota/language/{fr-FR.h => fr_FR.h} (100%) rename tasmota/language/{he-HE.h => he_HE.h} (100%) rename tasmota/language/{hu-HU.h => hu_HU.h} (100%) rename tasmota/language/{it-IT.h => it_IT.h} (100%) rename tasmota/language/{ko-KO.h => ko_KO.h} (100%) rename tasmota/language/{nl-NL.h => nl_NL.h} (100%) rename tasmota/language/{pl-PL.h => pl_PL.h} (100%) rename tasmota/language/{pt-BR.h => pt_BR.h} (100%) rename tasmota/language/{pt-PT.h => pt_PT.h} (100%) rename tasmota/language/{ro-RO.h => ro_RO.h} (100%) rename tasmota/language/{ru-RU.h => ru_RU.h} (100%) rename tasmota/language/{sk-SK.h => sk_SK.h} (100%) rename tasmota/language/{sv-SE.h => sv_SE.h} (100%) rename tasmota/language/{tr-TR.h => tr_TR.h} (100%) rename tasmota/language/{uk-UA.h => uk_UA.h} (100%) rename tasmota/language/{zh-CN.h => zh_CN.h} (100%) rename tasmota/language/{zh-TW.h => zh_TW.h} (100%) diff --git a/BUILDS.md b/BUILDS.md index 36a0bb48a..9173dbc41 100644 --- a/BUILDS.md +++ b/BUILDS.md @@ -2,7 +2,7 @@ | Feature or Sensor | minimal | lite | tasmota | knx | sensors | ir | display | Remarks |-----------------------|---------|-------|--------|-----|---------|----|---------|-------- -| MY_LANGUAGE en-GB | x | x | x | x | x | x | x | +| MY_LANGUAGE en_GB | x | x | x | x | x | x | x | | USE_ARDUINO_OTA | - | - | - | - | - | - | - | | USE_DOMOTICZ | - | - | x | x | x | x | - | | USE_HOME_ASSISTANT | - | - | x | x | x | x | - | diff --git a/platformio_tasmota_env.ini b/platformio_tasmota_env.ini index f122eae1b..dbf79d288 100644 --- a/platformio_tasmota_env.ini +++ b/platformio_tasmota_env.ini @@ -38,67 +38,67 @@ build_flags = ${common.build_flags} ${irremoteesp_full.build_flags} -DFIRMWARE_I build_flags = ${common.build_flags} ${irremoteesp_full.build_flags} [env:tasmota-BG] -build_flags = ${common.build_flags} -DMY_LANGUAGE=bg-BG +build_flags = ${common.build_flags} -DMY_LANGUAGE=bg_BG [env:tasmota-BR] -build_flags = ${common.build_flags} -DMY_LANGUAGE=pt-BR +build_flags = ${common.build_flags} -DMY_LANGUAGE=pt_BR [env:tasmota-CN] -build_flags = ${common.build_flags} -DMY_LANGUAGE=zh-CN +build_flags = ${common.build_flags} -DMY_LANGUAGE=zh_CN [env:tasmota-CZ] -build_flags = ${common.build_flags} -DMY_LANGUAGE=cs-CZ +build_flags = ${common.build_flags} -DMY_LANGUAGE=cs_CZ [env:tasmota-DE] -build_flags = ${common.build_flags} -DMY_LANGUAGE=de-DE +build_flags = ${common.build_flags} -DMY_LANGUAGE=de_DE [env:tasmota-ES] -build_flags = ${common.build_flags} -DMY_LANGUAGE=es-ES +build_flags = ${common.build_flags} -DMY_LANGUAGE=es_ES [env:tasmota-FR] -build_flags = ${common.build_flags} -DMY_LANGUAGE=fr-FR +build_flags = ${common.build_flags} -DMY_LANGUAGE=fr_FR [env:tasmota-GR] -build_flags = ${common.build_flags} -DMY_LANGUAGE=el-GR +build_flags = ${common.build_flags} -DMY_LANGUAGE=el_GR [env:tasmota-HE] -build_flags = ${common.build_flags} -DMY_LANGUAGE=he-HE +build_flags = ${common.build_flags} -DMY_LANGUAGE=he_HE [env:tasmota-HU] -build_flags = ${common.build_flags} -DMY_LANGUAGE=hu-HU +build_flags = ${common.build_flags} -DMY_LANGUAGE=hu_HU [env:tasmota-IT] -build_flags = ${common.build_flags} -DMY_LANGUAGE=it-IT +build_flags = ${common.build_flags} -DMY_LANGUAGE=it_IT [env:tasmota-KO] -build_flags = ${common.build_flags} -DMY_LANGUAGE=ko-KO +build_flags = ${common.build_flags} -DMY_LANGUAGE=ko_KO [env:tasmota-NL] -build_flags = ${common.build_flags} -DMY_LANGUAGE=nl-NL +build_flags = ${common.build_flags} -DMY_LANGUAGE=nl_NL [env:tasmota-PL] -build_flags = ${common.build_flags} -DMY_LANGUAGE=pl-PL +build_flags = ${common.build_flags} -DMY_LANGUAGE=pl_PL [env:tasmota-PT] -build_flags = ${common.build_flags} -DMY_LANGUAGE=pt-PT +build_flags = ${common.build_flags} -DMY_LANGUAGE=pt_PT [env:tasmota-RO] -build_flags = ${common.build_flags} -DMY_LANGUAGE=ro-RO +build_flags = ${common.build_flags} -DMY_LANGUAGE=ro_RO [env:tasmota-RU] -build_flags = ${common.build_flags} -DMY_LANGUAGE=ru-RU +build_flags = ${common.build_flags} -DMY_LANGUAGE=ru_RU [env:tasmota-SE] -build_flags = ${common.build_flags} -DMY_LANGUAGE=sv-SE +build_flags = ${common.build_flags} -DMY_LANGUAGE=sv_SE [env:tasmota-SK] -build_flags = ${common.build_flags} -DMY_LANGUAGE=sk-SK +build_flags = ${common.build_flags} -DMY_LANGUAGE=sk_SK [env:tasmota-TR] -build_flags = ${common.build_flags} -DMY_LANGUAGE=tr-TR +build_flags = ${common.build_flags} -DMY_LANGUAGE=tr_TR [env:tasmota-TW] -build_flags = ${common.build_flags} -DMY_LANGUAGE=zh-TW +build_flags = ${common.build_flags} -DMY_LANGUAGE=zh_TW [env:tasmota-UK] -build_flags = ${common.build_flags} -DMY_LANGUAGE=uk-UA +build_flags = ${common.build_flags} -DMY_LANGUAGE=uk_UA diff --git a/platformio_tasmota_env32.ini b/platformio_tasmota_env32.ini index 378922285..0c2e40fe3 100644 --- a/platformio_tasmota_env32.ini +++ b/platformio_tasmota_env32.ini @@ -47,88 +47,88 @@ build_flags = ${common32.build_flags} ${irremoteesp_full.build_flags [env:tasmota32-BG] extends = env:tasmota32 -build_flags = ${common32.build_flags} -DMY_LANGUAGE=bg-BG +build_flags = ${common32.build_flags} -DMY_LANGUAGE=bg_BG [env:tasmota32-BR] extends = env:tasmota32 -build_flags = ${common32.build_flags} -DMY_LANGUAGE=pt-BR +build_flags = ${common32.build_flags} -DMY_LANGUAGE=pt_BR [env:tasmota32-CN] extends = env:tasmota32 -build_flags = ${common32.build_flags} -DMY_LANGUAGE=zh-CN +build_flags = ${common32.build_flags} -DMY_LANGUAGE=zh_CN [env:tasmota32-CZ] extends = env:tasmota32 -build_flags = ${common32.build_flags} -DMY_LANGUAGE=cs-CZ +build_flags = ${common32.build_flags} -DMY_LANGUAGE=cs_CZ [env:tasmota32-DE] extends = env:tasmota32 -build_flags = ${common32.build_flags} -DMY_LANGUAGE=de-DE +build_flags = ${common32.build_flags} -DMY_LANGUAGE=de_DE [env:tasmota32-ES] extends = env:tasmota32 -build_flags = ${common32.build_flags} -DMY_LANGUAGE=es-ES +build_flags = ${common32.build_flags} -DMY_LANGUAGE=es_ES [env:tasmota32-FR] extends = env:tasmota32 -build_flags = ${common32.build_flags} -DMY_LANGUAGE=fr-FR +build_flags = ${common32.build_flags} -DMY_LANGUAGE=fr_FR [env:tasmota32-GR] extends = env:tasmota32 -build_flags = ${common32.build_flags} -DMY_LANGUAGE=el-GR +build_flags = ${common32.build_flags} -DMY_LANGUAGE=el_GR [env:tasmota32-HE] extends = env:tasmota32 -build_flags = ${common32.build_flags} -DMY_LANGUAGE=he-HE +build_flags = ${common32.build_flags} -DMY_LANGUAGE=he_HE [env:tasmota32-HU] extends = env:tasmota32 -build_flags = ${common32.build_flags} -DMY_LANGUAGE=hu-HU +build_flags = ${common32.build_flags} -DMY_LANGUAGE=hu_HU [env:tasmota32-IT] extends = env:tasmota32 -build_flags = ${common32.build_flags} -DMY_LANGUAGE=it-IT +build_flags = ${common32.build_flags} -DMY_LANGUAGE=it_IT [env:tasmota32-KO] extends = env:tasmota32 -build_flags = ${common32.build_flags} -DMY_LANGUAGE=ko-KO +build_flags = ${common32.build_flags} -DMY_LANGUAGE=ko_KO [env:tasmota32-NL] extends = env:tasmota32 -build_flags = ${common32.build_flags} -DMY_LANGUAGE=nl-NL +build_flags = ${common32.build_flags} -DMY_LANGUAGE=nl_NL [env:tasmota32-PL] extends = env:tasmota32 -build_flags = ${common32.build_flags} -DMY_LANGUAGE=pl-PL +build_flags = ${common32.build_flags} -DMY_LANGUAGE=pl_PL [env:tasmota32-PT] extends = env:tasmota32 -build_flags = ${common32.build_flags} -DMY_LANGUAGE=pt-PT +build_flags = ${common32.build_flags} -DMY_LANGUAGE=pt_PT [env:tasmota32-RO] extends = env:tasmota32 -build_flags = ${common32.build_flags} -DMY_LANGUAGE=ro-RO +build_flags = ${common32.build_flags} -DMY_LANGUAGE=ro_RO [env:tasmota32-RU] extends = env:tasmota32 -build_flags = ${common32.build_flags} -DMY_LANGUAGE=ru-RU +build_flags = ${common32.build_flags} -DMY_LANGUAGE=ru_RU [env:tasmota32-SE] extends = env:tasmota32 -build_flags = ${common32.build_flags} -DMY_LANGUAGE=sv-SE +build_flags = ${common32.build_flags} -DMY_LANGUAGE=sv_SE [env:tasmota32-SK] extends = env:tasmota32 -build_flags = ${common32.build_flags} -DMY_LANGUAGE=sk-SK +build_flags = ${common32.build_flags} -DMY_LANGUAGE=sk_SK [env:tasmota32-TR] extends = env:tasmota32 -build_flags = ${common32.build_flags} -DMY_LANGUAGE=tr-TR +build_flags = ${common32.build_flags} -DMY_LANGUAGE=tr_TR [env:tasmota32-TW] extends = env:tasmota32 -build_flags = ${common32.build_flags} -DMY_LANGUAGE=zh-TW +build_flags = ${common32.build_flags} -DMY_LANGUAGE=zh_TW [env:tasmota32-UK] extends = env:tasmota32 -build_flags = ${common32.build_flags} -DMY_LANGUAGE=uk-UA +build_flags = ${common32.build_flags} -DMY_LANGUAGE=uk_UA diff --git a/tasmota/i18n.h b/tasmota/i18n.h index 9989238fa..ab064f630 100644 --- a/tasmota/i18n.h +++ b/tasmota/i18n.h @@ -617,7 +617,7 @@ #define D_ASTERISK_PWD "****" #ifndef MY_LANGUAGE - #include "language/en-GB.h" + #include "language/en_GB.h" #else #define QUOTEME(x) QUOTEME_1(x) #define QUOTEME_1(x) #x @@ -625,7 +625,7 @@ #include INCLUDE_FILE(MY_LANGUAGE) #endif #ifndef LANGUAGE_LCID - #define LANGUAGE_LCID 2057 // en-GB + #define LANGUAGE_LCID 2057 // en_GB #endif // Common diff --git a/tasmota/language/bg-BG.h b/tasmota/language/bg_BG.h similarity index 100% rename from tasmota/language/bg-BG.h rename to tasmota/language/bg_BG.h diff --git a/tasmota/language/cs-CZ.h b/tasmota/language/cs_CZ.h similarity index 100% rename from tasmota/language/cs-CZ.h rename to tasmota/language/cs_CZ.h diff --git a/tasmota/language/de-DE.h b/tasmota/language/de_DE.h similarity index 100% rename from tasmota/language/de-DE.h rename to tasmota/language/de_DE.h diff --git a/tasmota/language/el-GR.h b/tasmota/language/el_GR.h similarity index 100% rename from tasmota/language/el-GR.h rename to tasmota/language/el_GR.h diff --git a/tasmota/language/en-GB.h b/tasmota/language/en_GB.h similarity index 100% rename from tasmota/language/en-GB.h rename to tasmota/language/en_GB.h diff --git a/tasmota/language/es-ES.h b/tasmota/language/es_ES.h similarity index 100% rename from tasmota/language/es-ES.h rename to tasmota/language/es_ES.h diff --git a/tasmota/language/fr-FR.h b/tasmota/language/fr_FR.h similarity index 100% rename from tasmota/language/fr-FR.h rename to tasmota/language/fr_FR.h diff --git a/tasmota/language/he-HE.h b/tasmota/language/he_HE.h similarity index 100% rename from tasmota/language/he-HE.h rename to tasmota/language/he_HE.h diff --git a/tasmota/language/hu-HU.h b/tasmota/language/hu_HU.h similarity index 100% rename from tasmota/language/hu-HU.h rename to tasmota/language/hu_HU.h diff --git a/tasmota/language/it-IT.h b/tasmota/language/it_IT.h similarity index 100% rename from tasmota/language/it-IT.h rename to tasmota/language/it_IT.h diff --git a/tasmota/language/ko-KO.h b/tasmota/language/ko_KO.h similarity index 100% rename from tasmota/language/ko-KO.h rename to tasmota/language/ko_KO.h diff --git a/tasmota/language/nl-NL.h b/tasmota/language/nl_NL.h similarity index 100% rename from tasmota/language/nl-NL.h rename to tasmota/language/nl_NL.h diff --git a/tasmota/language/pl-PL.h b/tasmota/language/pl_PL.h similarity index 100% rename from tasmota/language/pl-PL.h rename to tasmota/language/pl_PL.h diff --git a/tasmota/language/pt-BR.h b/tasmota/language/pt_BR.h similarity index 100% rename from tasmota/language/pt-BR.h rename to tasmota/language/pt_BR.h diff --git a/tasmota/language/pt-PT.h b/tasmota/language/pt_PT.h similarity index 100% rename from tasmota/language/pt-PT.h rename to tasmota/language/pt_PT.h diff --git a/tasmota/language/ro-RO.h b/tasmota/language/ro_RO.h similarity index 100% rename from tasmota/language/ro-RO.h rename to tasmota/language/ro_RO.h diff --git a/tasmota/language/ru-RU.h b/tasmota/language/ru_RU.h similarity index 100% rename from tasmota/language/ru-RU.h rename to tasmota/language/ru_RU.h diff --git a/tasmota/language/sk-SK.h b/tasmota/language/sk_SK.h similarity index 100% rename from tasmota/language/sk-SK.h rename to tasmota/language/sk_SK.h diff --git a/tasmota/language/sv-SE.h b/tasmota/language/sv_SE.h similarity index 100% rename from tasmota/language/sv-SE.h rename to tasmota/language/sv_SE.h diff --git a/tasmota/language/tr-TR.h b/tasmota/language/tr_TR.h similarity index 100% rename from tasmota/language/tr-TR.h rename to tasmota/language/tr_TR.h diff --git a/tasmota/language/uk-UA.h b/tasmota/language/uk_UA.h similarity index 100% rename from tasmota/language/uk-UA.h rename to tasmota/language/uk_UA.h diff --git a/tasmota/language/zh-CN.h b/tasmota/language/zh_CN.h similarity index 100% rename from tasmota/language/zh-CN.h rename to tasmota/language/zh_CN.h diff --git a/tasmota/language/zh-TW.h b/tasmota/language/zh_TW.h similarity index 100% rename from tasmota/language/zh-TW.h rename to tasmota/language/zh_TW.h diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h index 878c1a8ed..99b33bd5d 100644 --- a/tasmota/my_user_config.h +++ b/tasmota/my_user_config.h @@ -313,29 +313,29 @@ // -- Localization -------------------------------- // If non selected the default en-GB will be used -//#define MY_LANGUAGE bg-BG // Bulgarian in Bulgaria -//#define MY_LANGUAGE cs-CZ // Czech in Czech -//#define MY_LANGUAGE de-DE // German in Germany -//#define MY_LANGUAGE el-GR // Greek in Greece -//#define MY_LANGUAGE en-GB // English in Great Britain. Enabled by Default -//#define MY_LANGUAGE es-ES // Spanish in Spain -//#define MY_LANGUAGE fr-FR // French in France -//#define MY_LANGUAGE he-HE // Hebrew in Israel -//#define MY_LANGUAGE hu-HU // Hungarian in Hungary -//#define MY_LANGUAGE it-IT // Italian in Italy -//#define MY_LANGUAGE ko-KO // Korean in Korea -//#define MY_LANGUAGE nl-NL // Dutch in the Netherlands -//#define MY_LANGUAGE pl-PL // Polish in Poland -//#define MY_LANGUAGE pt-BR // Portuguese in Brazil -//#define MY_LANGUAGE pt-PT // Portuguese in Portugal -//#define MY_LANGUAGE ro-RO // Romanian in Romania -//#define MY_LANGUAGE ru-RU // Russian in Russia -//#define MY_LANGUAGE sk-SK // Slovak in Slovakia -//#define MY_LANGUAGE sv-SE // Swedish in Sweden -//#define MY_LANGUAGE tr-TR // Turkish in Turkey -//#define MY_LANGUAGE uk-UA // Ukrainian in Ukraine -//#define MY_LANGUAGE zh-CN // Chinese (Simplified) in China -//#define MY_LANGUAGE zh-TW // Chinese (Traditional) in Taiwan +//#define MY_LANGUAGE bg_BG // Bulgarian in Bulgaria +//#define MY_LANGUAGE cs_CZ // Czech in Czech +//#define MY_LANGUAGE de_DE // German in Germany +//#define MY_LANGUAGE el_GR // Greek in Greece +//#define MY_LANGUAGE en_GB // English in Great Britain. Enabled by Default +//#define MY_LANGUAGE es_ES // Spanish in Spain +//#define MY_LANGUAGE fr_FR // French in France +//#define MY_LANGUAGE he_HE // Hebrew in Israel +//#define MY_LANGUAGE hu_HU // Hungarian in Hungary +//#define MY_LANGUAGE it_IT // Italian in Italy +//#define MY_LANGUAGE ko_KO // Korean in Korea +//#define MY_LANGUAGE nl_NL // Dutch in the Netherlands +//#define MY_LANGUAGE pl_PL // Polish in Poland +//#define MY_LANGUAGE pt_BR // Portuguese in Brazil +//#define MY_LANGUAGE pt_PT // Portuguese in Portugal +//#define MY_LANGUAGE ro_RO // Romanian in Romania +//#define MY_LANGUAGE ru_RU // Russian in Russia +//#define MY_LANGUAGE sk_SK // Slovak in Slovakia +//#define MY_LANGUAGE sv_SE // Swedish in Sweden +//#define MY_LANGUAGE tr_TR // Turkish in Turkey +//#define MY_LANGUAGE uk_UA // Ukrainian in Ukraine +//#define MY_LANGUAGE zh_CN // Chinese (Simplified) in China +//#define MY_LANGUAGE zh_TW // Chinese (Traditional) in Taiwan // -- Wifi Config tools --------------------------- #define WIFI_SOFT_AP_CHANNEL 1 // Soft Access Point Channel number between 1 and 13 as used by Wifi Manager web GUI