From 4037184ee05e1ba4b85782cec68390c59cfdbf40 Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Sun, 7 Aug 2022 11:33:32 +0200 Subject: [PATCH] Fix catalan workflows --- .github/workflows/Tasmota_build_devel.yml | 2 +- .github/workflows/Tasmota_build_master.yml | 2 +- .github/workflows/build_all_the_things.yml | 2 +- CHANGELOG.md | 2 +- RELEASENOTES.md | 2 +- platformio_tasmota_env.ini | 6 +++--- platformio_tasmota_env32.ini | 8 ++++---- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/Tasmota_build_devel.yml b/.github/workflows/Tasmota_build_devel.yml index 184cca854..b7bc2224e 100644 --- a/.github/workflows/Tasmota_build_devel.yml +++ b/.github/workflows/Tasmota_build_devel.yml @@ -77,7 +77,7 @@ jobs: strategy: matrix: variant: [ tasmota, tasmota32 ] - language: [ AF, BG, BR, CA, CN, CZ, DE, ES, FR, FY, GR, HE, HU, IT, KO, NL, PL, PT, RO, RU, SE, SK, TR, TW, UK, VN ] + language: [ AD, AF, BG, BR, CN, CZ, DE, ES, FR, FY, GR, HE, HU, IT, KO, NL, PL, PT, RO, RU, SE, SK, TR, TW, UK, VN ] steps: - uses: actions/checkout@v3 with: diff --git a/.github/workflows/Tasmota_build_master.yml b/.github/workflows/Tasmota_build_master.yml index 26e0089c1..8d747bf2f 100644 --- a/.github/workflows/Tasmota_build_master.yml +++ b/.github/workflows/Tasmota_build_master.yml @@ -76,7 +76,7 @@ jobs: strategy: matrix: variant: [ tasmota, tasmota32 ] - language: [ AF, BG, BR, CA, CN, CZ, DE, ES, FR, FY, GR, HE, HU, IT, KO, NL, PL, PT, RO, RU, SE, SK, TR, TW, UK, VN ] + language: [ AD, AF, BG, BR, CN, CZ, DE, ES, FR, FY, GR, HE, HU, IT, KO, NL, PL, PT, RO, RU, SE, SK, TR, TW, UK, VN ] steps: - uses: actions/checkout@v3 with: diff --git a/.github/workflows/build_all_the_things.yml b/.github/workflows/build_all_the_things.yml index aa7f5e7c2..65671604e 100644 --- a/.github/workflows/build_all_the_things.yml +++ b/.github/workflows/build_all_the_things.yml @@ -80,7 +80,7 @@ jobs: strategy: matrix: variant: [ tasmota ] - language: [ AF, BG, BR, CA, CN, CZ, DE, ES, FR, FY, GR, HE, HU, IT, KO, NL, PL, PT, RO, RU, SE, SK, TR, TW, UK, VN ] + language: [ AD, AF, BG, BR, CN, CZ, DE, ES, FR, FY, GR, HE, HU, IT, KO, NL, PL, PT, RO, RU, SE, SK, TR, TW, UK, VN ] steps: - uses: actions/checkout@v2 - name: Set up Python diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a394efd4..bfd8d1328 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ All notable changes to this project will be documented in this file. - Zigbee add Battery auto-probe (can be disabled with ``SetOption143 1``) (#16148) - Zigbee include "BatteryPercentage" in all messages - Commands ``WifiScan`` and ``WifiTest`` (#16141) -- Support for Catalan language translations by HardwareBoffin (#16145) +- Support for Catalan language translations by Albert Gonzalez (#16145) ### Changed - ESP32 LVGL library from v8.2.0 to v8.3.0 (#16019) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 01b9b6df9..9e1e1015b 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -120,7 +120,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmo - Support for bistable (latching) relays mixed with monostable relays using GPIO Relay_b or Relay_bi as used by Sonoff POWR320D and THR320D - Support for Modbus bridge adding commands ``ModbusSend``, ``ModbusBaudrate`` and ``ModbusSerialConfig`` [#16013](https://github.com/arendst/Tasmota/issues/16013) - Support for multiple ``IRsend`` GPIOs [#16138](https://github.com/arendst/Tasmota/issues/16138) -- Support for Catalan language translations by HardwareBoffin [#16145](https://github.com/arendst/Tasmota/issues/16145) +- Support for Catalan language translations by Albert Gonzalez [#16145](https://github.com/arendst/Tasmota/issues/16145) - Zigbee added recording of when the battery was last reported [#16146](https://github.com/arendst/Tasmota/issues/16146) - Zigbee add Battery auto-probe (can be disabled with ``SetOption143 1``) [#16148](https://github.com/arendst/Tasmota/issues/16148) - ESP32 Support for Ultra Low Power (ULP) coprocessor via Berry by Christian Staars [#15916](https://github.com/arendst/Tasmota/issues/15916) diff --git a/platformio_tasmota_env.ini b/platformio_tasmota_env.ini index 46f6412a8..65a5490c7 100644 --- a/platformio_tasmota_env.ini +++ b/platformio_tasmota_env.ini @@ -71,6 +71,9 @@ build_flags = ${env.build_flags} -DUSE_ZIGBEE -DUSE_CCLOADER -DUSE_U board = esp8266_4M2M board_build.f_cpu = 160000000L +[env:tasmota-AD] +build_flags = ${env.build_flags} -DMY_LANGUAGE=ca_AD + [env:tasmota-AF] build_flags = ${env.build_flags} -DMY_LANGUAGE=af_AF @@ -83,9 +86,6 @@ build_flags = ${env.build_flags} -DMY_LANGUAGE=pt_BR [env:tasmota-CN] build_flags = ${env.build_flags} -DMY_LANGUAGE=zh_CN -[env:tasmota-CA] -build_flags = ${env.build_flags} -DMY_LANGUAGE=ca_AD - [env:tasmota-CZ] build_flags = ${env.build_flags} -DMY_LANGUAGE=cs_CZ diff --git a/platformio_tasmota_env32.ini b/platformio_tasmota_env32.ini index f5f30922f..44c5de0df 100644 --- a/platformio_tasmota_env32.ini +++ b/platformio_tasmota_env32.ini @@ -238,6 +238,10 @@ board = esp32s3cdc extends = env:tasmota32s3 board = esp32s3cdc +[env:tasmota32-AD] +extends = env:tasmota32_base +build_flags = ${env:tasmota32_base.build_flags} -DMY_LANGUAGE=ca_AD -DFIRMWARE_TASMOTA32 + [env:tasmota32-AF] extends = env:tasmota32_base build_flags = ${env:tasmota32_base.build_flags} -DMY_LANGUAGE=af_AF -DFIRMWARE_TASMOTA32 @@ -254,10 +258,6 @@ build_flags = ${env:tasmota32_base.build_flags} -DMY_LANGUAGE=pt_BR extends = env:tasmota32_base build_flags = ${env:tasmota32_base.build_flags} -DMY_LANGUAGE=zh_CN -DFIRMWARE_TASMOTA32 -[env:tasmota32-CA] -extends = env:tasmota32_base -build_flags = ${env:tasmota32_base.build_flags} -DMY_LANGUAGE=ca_AD -DFIRMWARE_TASMOTA32 - [env:tasmota32-CZ] extends = env:tasmota32_base build_flags = ${env:tasmota32_base.build_flags} -DMY_LANGUAGE=cs_CZ -DFIRMWARE_TASMOTA32