feat: add a separate setting for selecting 'text language' when ALL_LANGS is set (#6960)

This commit is contained in:
philmoz
2026-01-08 12:34:22 +10:00
committed by GitHub
parent a3ccc87a88
commit 4f90a5e426
60 changed files with 352 additions and 95 deletions
+1
View File
@@ -970,6 +970,7 @@
#define TR_USBMODE "USB模式"
#define TR_JACK_MODE "教练插口模式"
#define TR_VOICE_LANGUAGE "播报语言"
#define TR_TEXT_LANGUAGE "Text language"
#define TR_UNITS_SYSTEM "单位"
#define TR_UNITS_PPM "PPM 单位"
#define TR_EDIT "编辑"
+1
View File
@@ -968,6 +968,7 @@
#define TR_USBMODE "Režim USB"
#define TR_JACK_MODE "Režim Jack"
#define TR_VOICE_LANGUAGE "Jazyk hlasu"
#define TR_TEXT_LANGUAGE "Text language"
#define TR_UNITS_SYSTEM "Jednotky"
#define TR_UNITS_PPM "PPM jednotky"
#define TR_EDIT "Upravit"
+1
View File
@@ -975,6 +975,7 @@
#define TR_USBMODE "USB tilstand"
#define TR_JACK_MODE "Jack tilstand"
#define TR_VOICE_LANGUAGE "Stemme sprog"
#define TR_TEXT_LANGUAGE "Text language"
#define TR_UNITS_SYSTEM "Enheder"
#define TR_UNITS_PPM "PPM enheder"
#define TR_EDIT "Rediger"
+1
View File
@@ -964,6 +964,7 @@
#define TR_USBMODE "USB Modus"
#define TR_JACK_MODE "Jack Mode"
#define TR_VOICE_LANGUAGE "Sprachansagen"
#define TR_TEXT_LANGUAGE "Text language"
#define TR_UNITS_SYSTEM "Einheiten"
#define TR_UNITS_PPM "PPM Einheiten"
#define TR_EDIT "Zeile Editieren"
+1
View File
@@ -971,6 +971,7 @@
#define TR_USBMODE "USB mode"
#define TR_JACK_MODE "Jack mode"
#define TR_VOICE_LANGUAGE "Voice language"
#define TR_TEXT_LANGUAGE "Text language"
#define TR_UNITS_SYSTEM "Units"
#define TR_UNITS_PPM "PPM Units"
#define TR_EDIT "Edit"
+1
View File
@@ -964,6 +964,7 @@
#define TR_USBMODE "Modo USB"
#define TR_JACK_MODE "Modo Jack"
#define TR_VOICE_LANGUAGE "Idioma voces"
#define TR_TEXT_LANGUAGE "Text language"
#define TR_UNITS_SYSTEM "Unidades"
#define TR_UNITS_PPM "PPM Units"
#define TR_EDIT "Editar"
+1
View File
@@ -964,6 +964,7 @@
#define TR_USBMODE "USB-tila"
#define TR_JACK_MODE "Jack Mode"
#define TR_VOICE_LANGUAGE "Äänen kieli"
#define TR_TEXT_LANGUAGE "Text language"
#define TR_UNITS_SYSTEM "Units"
#define TR_UNITS_PPM "PPM Units"
#define TR_EDIT "Edit"
+1
View File
@@ -968,6 +968,7 @@
#define TR_USBMODE "Mode USB"
#define TR_JACK_MODE "Mode Jack"
#define TR_VOICE_LANGUAGE TR("Langue voix", "Langue annonces vocales")
#define TR_TEXT_LANGUAGE "Text language"
#define TR_UNITS_SYSTEM "Unités"
#define TR_UNITS_PPM "PPM Units"
#define TR_EDIT "Éditer"
+1
View File
@@ -973,6 +973,7 @@
#define TR_USBMODE "USB מצב"
#define TR_JACK_MODE "Jack mode"
#define TR_VOICE_LANGUAGE "שפת שמע"
#define TR_TEXT_LANGUAGE "Text language"
#define TR_UNITS_SYSTEM "יחידות"
#define TR_UNITS_PPM "PPM Units"
#define TR_EDIT "ערוך"
+1
View File
@@ -970,6 +970,7 @@
#define TR_USBMODE "Modo USB"
#define TR_JACK_MODE "Modo JACK"
#define TR_VOICE_LANGUAGE "Lingua vocale"
#define TR_TEXT_LANGUAGE "Text language"
#define TR_UNITS_SYSTEM "Unità"
#define TR_UNITS_PPM "Unità PPM"
#define TR_EDIT "Modifica"
+1
View File
@@ -969,6 +969,7 @@
#define TR_USBMODE "USBモード"
#define TR_JACK_MODE "Jackモード"
#define TR_VOICE_LANGUAGE "音声言語"
#define TR_TEXT_LANGUAGE "Text language"
#define TR_UNITS_SYSTEM "ユニット"
#define TR_UNITS_PPM "PPMユニット"
#define TR_EDIT "編集"
+1
View File
@@ -1014,6 +1014,7 @@
#define TR_USBMODE "USB 모드"
#define TR_JACK_MODE "잭 모드"
#define TR_VOICE_LANGUAGE "음성 언어"
#define TR_TEXT_LANGUAGE "Text language"
#define TR_UNITS_SYSTEM "단위 체계"
#define TR_UNITS_PPM "PPM 단위"
#define TR_EDIT "편집"
+1
View File
@@ -966,6 +966,7 @@
#define TR_USBMODE "USB Mode"
#define TR_JACK_MODE "Jack Mode"
#define TR_VOICE_LANGUAGE "Taal"
#define TR_TEXT_LANGUAGE "Text language"
#define TR_UNITS_SYSTEM "Eenheden"
#define TR_UNITS_PPM "PPM Units"
#define TR_EDIT "Wijzigen"
+1
View File
@@ -963,6 +963,7 @@
#define TR_USBMODE "Tryb USB"
#define TR_JACK_MODE "Tryb Jack"
#define TR_VOICE_LANGUAGE "Język głosu"
#define TR_TEXT_LANGUAGE "Text language"
#define TR_UNITS_SYSTEM "Jednostki"
#define TR_UNITS_PPM "Jednostki PPM"
#define TR_EDIT "Edytuj"
+1
View File
@@ -971,6 +971,7 @@
#define TR_USBMODE "Modo USB"
#define TR_JACK_MODE "Jack mode"
#define TR_VOICE_LANGUAGE "Idoma da Voz"
#define TR_TEXT_LANGUAGE "Text language"
#define TR_UNITS_SYSTEM "Unidades"
#define TR_UNITS_PPM "Unidade PPM"
#define TR_EDIT "Editar"
+1
View File
@@ -972,6 +972,7 @@
#define TR_USBMODE "Режим USB"
#define TR_JACK_MODE "Режим разъема"
#define TR_VOICE_LANGUAGE "Язык озвучки"
#define TR_TEXT_LANGUAGE "Text language"
#define TR_UNITS_SYSTEM "Единицы"
#define TR_UNITS_PPM "PPM Един"
#define TR_EDIT "Редактировать"
+1
View File
@@ -971,6 +971,7 @@
#define TR_USBMODE "USB-läge"
#define TR_JACK_MODE "Uttagsläge"
#define TR_VOICE_LANGUAGE "Röstspråk"
#define TR_TEXT_LANGUAGE "Text language"
#define TR_UNITS_SYSTEM "Enheter"
#define TR_UNITS_PPM "PPM-enheter"
#define TR_EDIT "Redigera"
+1
View File
@@ -967,6 +967,7 @@
#define TR_USBMODE "USB模式"
#define TR_JACK_MODE "教練插口模式"
#define TR_VOICE_LANGUAGE "播報語言"
#define TR_TEXT_LANGUAGE "Text language"
#define TR_UNITS_SYSTEM "單位"
#define TR_UNITS_PPM "PPM 單位"
#define TR_EDIT "編輯"
+1
View File
@@ -971,6 +971,7 @@
#define TR_USBMODE "Режим USB"
#define TR_JACK_MODE "Режим коннектора"
#define TR_VOICE_LANGUAGE "Мова голосу"
#define TR_TEXT_LANGUAGE "Text language"
#define TR_UNITS_SYSTEM "Одиниці"
#define TR_UNITS_PPM "PPM одиниці"
#define TR_EDIT "Редагувати"
+1
View File
@@ -978,6 +978,7 @@
#define STR_TEST_NOTSAFE currentLangStrings->STR_TEST_NOTSAFE
#define STR_TEST_WARNING currentLangStrings->STR_TEST_WARNING
#define STR_TEXT_COLOR currentLangStrings->STR_TEXT_COLOR
#define STR_TEXT_LANGUAGE currentLangStrings->STR_TEXT_LANGUAGE
#define STR_THEME currentLangStrings->STR_THEME
#define STR_THROTTLE_LABEL currentLangStrings->STR_THROTTLE_LABEL
#define STR_THROTTLE_NOT_IDLE currentLangStrings->STR_THROTTLE_NOT_IDLE
+1
View File
@@ -977,6 +977,7 @@ STR(TEMP_CALIB)
STR(TEST_NOTSAFE)
STR(TEST_WARNING)
STR(TEXT_COLOR)
STR(TEXT_LANGUAGE)
STR(THEME)
STR(THROTTLE_LABEL)
STR(THROTTLE_NOT_IDLE)
+23
View File
@@ -62,6 +62,16 @@
#include "translations/i18n/en.h"
#endif
uint8_t getLanguageId(const char* lang)
{
for (uint8_t i = 0; languagePacks[i] != nullptr; i++) {
if (!strncmp(lang, languagePacks[i]->id, 2)) {
return i;
}
}
return LANG_EN;
}
const char CHR_HOUR = TR_CHR_HOUR;
const char CHR_INPUT = TR_CHR_INPUT;
@@ -80,6 +90,19 @@ const char CHR_INPUT = TR_CHR_INPUT;
#else
bool isTextLangAvail(int lang)
{
#if defined(COLORLCD)
// Skip languages with no translation files
return lang != LANG_HU && lang != LANG_SK;
#else
// Skip languages with no translation files or no unicode fonts
return lang != LANG_CN && lang != LANG_HE && lang != LANG_HU &&
lang != LANG_JP && lang != LANG_KO && lang != LANG_SK &&
lang != LANG_TW;
#endif
}
// Order must match languagePack[]
#if defined(COLORLCD)
const LangStrings* const langStrings[] = {
+2
View File
@@ -41,6 +41,8 @@
#else
bool isTextLangAvail(int lang);
// Static string
#define STR(x) extern const char STR_##x[];
// Static string array
+1
View File
@@ -45,6 +45,7 @@ struct LanguagePack {
extern const LanguagePack * currentLanguagePack;
extern uint8_t currentLanguagePackIdx;
extern uint8_t getLanguageId(const char* lang);
enum RadioLanguage {
LANG_CN,