piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/datastructs.h
+5 -5
View File
@@ -77,15 +77,15 @@ static inline void check_struct()
#endif
#if defined(PCBXLITES)
CHKSIZE(RadioData, 948);
CHKSIZE(RadioData, 950);
#elif defined(RADIO_ST16) || defined(PCBPA01) || defined(RADIO_TX15) || defined(RADIO_T15PRO)
CHKSIZE(RadioData, 1179);
CHKSIZE(RadioData, 1181);
#elif defined(COLORLCD)
CHKSIZE(RadioData, 1059);
CHKSIZE(RadioData, 1061);
#elif defined(RADIO_GX12)
CHKSIZE(RadioData, 1066);
CHKSIZE(RadioData, 1068);
#else
CHKSIZE(RadioData, 946);
CHKSIZE(RadioData, 948);
#endif
#if defined(RADIO_TPRO) || defined(RADIO_TPROV2) || defined(RADIO_BUMBLEBEE)
radio/src/datastructs_private.h
+1
View File
@@ -1079,6 +1079,7 @@ PACK(struct RadioData {
NOBACKUP(uint8_t sportUpdatePower:1 SKIP);
NOBACKUP(char ttsLanguage[2]);
NOBACKUP(char uiLanguage[2]);
NOBACKUP(int8_t beepVolume:4 CUST(r_5pos,w_5pos));
NOBACKUP(int8_t wavVolume:4 CUST(r_5pos,w_5pos));
NOBACKUP(int8_t varioVolume:4 CUST(r_5pos,w_5pos));
radio/src/edgetx.cpp
+8
View File
@@ -310,6 +310,13 @@ void generalDefaultSwitches()
}
}
void generalDefaultUILanguage()
{
memcpy(g_eeGeneral.uiLanguage, TRANSLATIONS, 2);
g_eeGeneral.uiLanguage[0] = tolower(g_eeGeneral.uiLanguage[0]);
g_eeGeneral.uiLanguage[1] = tolower(g_eeGeneral.uiLanguage[1]);
}
void generalDefault()
{
memclear(&g_eeGeneral, sizeof(g_eeGeneral));
@@ -365,6 +372,7 @@ void generalDefault()
g_eeGeneral.lightAutoOff = 2;
g_eeGeneral.inactivityTimer = 10;
generalDefaultUILanguage();
g_eeGeneral.ttsLanguage[0] = 'e';
g_eeGeneral.ttsLanguage[1] = 'n';
g_eeGeneral.wavVolume = 2;
radio/src/edgetx.h
+1
View File
@@ -348,6 +348,7 @@ uint16_t isqrt32(uint32_t n);
void setDefaultOwnerId();
void generalDefault();
void generalDefaultSwitches();
void generalDefaultUILanguage();
uint32_t hash(const void * ptr, uint32_t size);
radio/src/gui/128x64/radio_setup.cpp
+25 -7
View File
@@ -99,7 +99,10 @@ enum {
CASE_GPS(ITEM_RADIO_SETUP_ADJUST_RTC)
CASE_GPS(ITEM_RADIO_SETUP_GPSFORMAT)
CASE_PXX1(ITEM_RADIO_SETUP_COUNTRYCODE)
ITEM_RADIO_SETUP_LANGUAGE,
ITEM_RADIO_SETUP_VOICE_LANGUAGE,
#if defined(ALL_LANGS)
ITEM_RADIO_SETUP_TEXT_LANGUAGE,
#endif
ITEM_RADIO_SETUP_IMPERIAL,
ITEM_RADIO_SETUP_PPM,
IF_FAI_CHOICE(ITEM_RADIO_SETUP_FAI)
@@ -238,6 +241,9 @@ void menuRadioSetup(event_t event)
CASE_GPS(0)
CASE_PXX1(0)
0, 0, 0,
#if defined(ALL_LANGS)
0, // text language
#endif
IF_FAI_CHOICE(0)
0,
0, // USB mode
@@ -708,7 +714,7 @@ void menuRadioSetup(event_t event)
break;
#endif
case ITEM_RADIO_SETUP_LANGUAGE:
case ITEM_RADIO_SETUP_VOICE_LANGUAGE:
lcdDrawTextAlignedLeft(y, STR_VOICE_LANGUAGE);
#if !defined(ALL_LANGS)
lcdDrawText(LCD_W-2, y, currentLanguagePack->name, attr|RIGHT);
@@ -720,15 +726,27 @@ void menuRadioSetup(event_t event)
if (checkIncDec_Ret) {
currentLanguagePack = languagePacks[currentLanguagePackIdx];
strncpy(g_eeGeneral.ttsLanguage, currentLanguagePack->id, 2);
#if defined(ALL_LANGS)
currentLangStrings = langStrings[currentLanguagePackIdx];
extern void setLanguageFont(int n);
setLanguageFont(currentLanguagePackIdx);
#endif
}
}
break;
#if defined(ALL_LANGS)
case ITEM_RADIO_SETUP_TEXT_LANGUAGE:
lcdDrawTextAlignedLeft(y, STR_TEXT_LANGUAGE);
lcdDrawText(LCD_W-2, y, languagePacks[getLanguageId(g_eeGeneral.uiLanguage)]->name(), attr|RIGHT);
if (attr) {
int textLangId = checkIncDec(event, getLanguageId(g_eeGeneral.uiLanguage), 0, DIM(languagePacks)-2, EE_GENERAL, isTextLangAvail);
if (checkIncDec_Ret) {
currentLanguagePack = languagePacks[currentLanguagePackIdx];
strncpy(g_eeGeneral.uiLanguage, languagePacks[textLangId]->id, 2);
currentLangStrings = langStrings[textLangId];
extern void setLanguageFont(int n);
setLanguageFont(textLangId);
}
}
break;
#endif
case ITEM_RADIO_SETUP_IMPERIAL:
g_eeGeneral.imperial = editChoice(LCD_W-2, y, STR_UNITS_SYSTEM, STR_VUNITSSYSTEM, g_eeGeneral.imperial, 0, 1, attr|RIGHT, event);
break;
radio/src/gui/212x64/radio_setup.cpp
+25 -7
View File
@@ -98,7 +98,10 @@ enum MenuRadioSetupItems {
CASE_GPS(ITEM_RADIO_SETUP_ADJUST_RTC)
CASE_GPS(ITEM_RADIO_SETUP_GPSFORMAT)
CASE_PXX1(ITEM_RADIO_SETUP_COUNTRYCODE)
ITEM_RADIO_SETUP_LANGUAGE,
ITEM_RADIO_SETUP_VOICE_LANGUAGE,
#if defined(ALL_LANGS)
ITEM_RADIO_SETUP_TEXT_LANGUAGE,
#endif
ITEM_RADIO_SETUP_IMPERIAL,
ITEM_RADIO_SETUP_PPM,
IF_FAI_CHOICE(ITEM_RADIO_SETUP_FAI)
@@ -238,6 +241,9 @@ void menuRadioSetup(event_t event)
CASE_GPS(0)
CASE_PXX1(0) // country code
0, // voice language
#if defined(ALL_LANGS)
0, // text language
#endif
0, // imperial
0, // PPM unit
IF_FAI_CHOICE(0)
@@ -679,7 +685,7 @@ void menuRadioSetup(event_t event)
break;
#endif
case ITEM_RADIO_SETUP_LANGUAGE:
case ITEM_RADIO_SETUP_VOICE_LANGUAGE:
lcdDrawTextAlignedLeft(y, STR_VOICE_LANGUAGE);
#if !defined(ALL_LANGS)
lcdDrawText(RADIO_SETUP_2ND_COLUMN, y, currentLanguagePack->name, attr);
@@ -691,15 +697,27 @@ void menuRadioSetup(event_t event)
if (checkIncDec_Ret) {
currentLanguagePack = languagePacks[currentLanguagePackIdx];
strncpy(g_eeGeneral.ttsLanguage, currentLanguagePack->id, 2);
#if defined(ALL_LANGS)
currentLangStrings = langStrings[currentLanguagePackIdx];
extern void setLanguageFont(int n);
setLanguageFont(currentLanguagePackIdx);
#endif
}
}
break;
#if defined(ALL_LANGS)
case ITEM_RADIO_SETUP_TEXT_LANGUAGE:
lcdDrawTextAlignedLeft(y, STR_TEXT_LANGUAGE);
lcdDrawText(RADIO_SETUP_2ND_COLUMN, y, languagePacks[getLanguageId(g_eeGeneral.uiLanguage)]->name(), attr);
if (attr) {
int textLangId = checkIncDec(event, getLanguageId(g_eeGeneral.uiLanguage), 0, DIM(languagePacks)-2, EE_GENERAL, isTextLangAvail);
if (checkIncDec_Ret) {
currentLanguagePack = languagePacks[currentLanguagePackIdx];
strncpy(g_eeGeneral.uiLanguage, languagePacks[textLangId]->id, 2);
currentLangStrings = langStrings[textLangId];
extern void setLanguageFont(int n);
setLanguageFont(textLangId);
}
}
break;
#endif
case ITEM_RADIO_SETUP_IMPERIAL:
g_eeGeneral.imperial = editChoice(RADIO_SETUP_2ND_COLUMN, y, STR_UNITS_SYSTEM, STR_VUNITSSYSTEM, g_eeGeneral.imperial, 0, 1, attr, event);
break;
radio/src/gui/colorlcd/radio/radio_setup.cpp
+38 -13
View File
@@ -852,19 +852,6 @@ static SetupLineDef setupLines[] = {
currentLanguagePack = languagePacks[currentLanguagePackIdx];
strncpy(g_eeGeneral.ttsLanguage, currentLanguagePack->id, 2);
SET_DIRTY();
#if defined(ALL_LANGS)
currentLangStrings = langStrings[currentLanguagePackIdx];
extern void setLanguageFont(int idx);
setLanguageFont(currentLanguagePackIdx);
PageGroup* pg = (PageGroup*)Layer::getPageGroup();
coord_t y = pg->getScrollY();
pg->onCancel();
QuickMenu::openPage(QM_RADIO_SETUP);
pg = (PageGroup*)Layer::getPageGroup();
pg->setScrollY(y);
// Force QM rebuild for language change
QuickMenu::shutdownQuickMenu();
#endif
});
#if !defined(ALL_LANGS)
choice->setTextHandler(
@@ -884,6 +871,44 @@ static SetupLineDef setupLines[] = {
#endif
}
},
#if defined(ALL_LANGS)
{
// UI language
STR_DEF(STR_TEXT_LANGUAGE),
[](Window* parent, coord_t x, coord_t y) {
auto choice =
new Choice(parent, {x, y, 0, 0}, 0, DIM(languagePacks) - 2,
GET_VALUE(getLanguageId(g_eeGeneral.uiLanguage)),
[](uint8_t newValue) {
strncpy(g_eeGeneral.uiLanguage, languagePacks[newValue]->id, 2);
currentLangStrings = langStrings[newValue];
extern void setLanguageFont(int idx);
setLanguageFont(newValue);
PageGroup* pg = (PageGroup*)Layer::getPageGroup();
coord_t y = pg->getScrollY();
pg->onCancel();
QuickMenu::openPage(QM_RADIO_SETUP);
pg = (PageGroup*)Layer::getPageGroup();
pg->setScrollY(y);
// Force QM rebuild for language change
QuickMenu::shutdownQuickMenu();
SET_DIRTY();
});
choice->setAvailableHandler([=](int n) { return isTextLangAvail(n); });
choice->setTextHandler(
[](uint8_t value) {
// TODO: language name should always be in the language of the name, not
// the current UI language. Needs translation characters to be
// always available for all language names in the base font.
// temp solution - prepend language id to name.
std::string s(languagePacks[value]->id);
s += " - ";
s += languagePacks[value]->name();
return s;
});
}
},
#endif
{
// Imperial units
STR_DEF(STR_UNITS_SYSTEM),
radio/src/lua/api_general.cpp
+2 -2
View File
@@ -1760,8 +1760,8 @@ static int luaGetGeneralSettings(lua_State * L)
lua_pushtableinteger(L, "imperial", g_eeGeneral.imperial);
#if defined(ALL_LANGS)
char l[3];
l[0] = toupper(g_eeGeneral.ttsLanguage[0]);
l[1] = toupper(g_eeGeneral.ttsLanguage[1]);
l[0] = toupper(g_eeGeneral.uiLanguage[0]);
l[1] = toupper(g_eeGeneral.uiLanguage[1]);
l[2] = 0;
lua_pushtablestring(L, "language", l);
#else
radio/src/lua/lua_widget_factory.cpp
+2 -2
View File
@@ -112,8 +112,8 @@ void LuaWidgetFactory::translateOptions(WidgetOption * options)
#if defined(ALL_LANGS)
char lang[3];
lang[0] = toupper(g_eeGeneral.ttsLanguage[0]);
lang[1] = toupper(g_eeGeneral.ttsLanguage[1]);
lang[0] = toupper(g_eeGeneral.uiLanguage[0]);
lang[1] = toupper(g_eeGeneral.uiLanguage[1]);
lang[2] = 0;
#else
const char* lang = TRANSLATIONS;
radio/src/storage/sdcard_common.cpp
+8 -10
View File
@@ -243,18 +243,16 @@ void storageReadAll()
}
#endif
for (uint8_t i = 0; languagePacks[i] != nullptr; i++) {
if (!strncmp(g_eeGeneral.ttsLanguage, languagePacks[i]->id, 2)) {
currentLanguagePackIdx = i;
currentLanguagePack = languagePacks[i];
if (g_eeGeneral.uiLanguage[0] == 0)
generalDefaultUILanguage();
currentLanguagePackIdx = getLanguageId(g_eeGeneral.ttsLanguage);
currentLanguagePack = languagePacks[currentLanguagePackIdx];
#if defined(ALL_LANGS)
currentLangStrings = langStrings[currentLanguagePackIdx];
extern void setLanguageFont(int n);
setLanguageFont(currentLanguagePackIdx);
uint8_t uiLangIdx = getLanguageId(g_eeGeneral.uiLanguage);
currentLangStrings = langStrings[uiLangIdx];
extern void setLanguageFont(int n);
setLanguageFont(uiLangIdx);
#endif
break;
}
}
#if defined(STORAGE_MODELSLIST)
// and reload the list
radio/src/storage/yaml/yaml_datastructs_128x64.cpp
+1
View File
@@ -343,6 +343,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "jackMode", 2 ),
YAML_PADDING( 1 ),
YAML_STRING("ttsLanguage", 2),
YAML_STRING("uiLanguage", 2),
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
radio/src/storage/yaml/yaml_datastructs_f16.cpp
+1
View File
@@ -399,6 +399,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "jackMode", 2 ),
YAML_PADDING( 1 ),
YAML_STRING("ttsLanguage", 2),
YAML_STRING("uiLanguage", 2),
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
radio/src/storage/yaml/yaml_datastructs_gx12.cpp
+1
View File
@@ -367,6 +367,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "jackMode", 2 ),
YAML_PADDING( 1 ),
YAML_STRING("ttsLanguage", 2),
YAML_STRING("uiLanguage", 2),
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
radio/src/storage/yaml/yaml_datastructs_nb4p.cpp
+1
View File
@@ -392,6 +392,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "jackMode", 2 ),
YAML_PADDING( 1 ),
YAML_STRING("ttsLanguage", 2),
YAML_STRING("uiLanguage", 2),
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
radio/src/storage/yaml/yaml_datastructs_nv14.cpp
+1
View File
@@ -399,6 +399,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "jackMode", 2 ),
YAML_PADDING( 1 ),
YAML_STRING("ttsLanguage", 2),
YAML_STRING("uiLanguage", 2),
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
radio/src/storage/yaml/yaml_datastructs_pa01.cpp
+1
View File
@@ -422,6 +422,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "jackMode", 2 ),
YAML_PADDING( 1 ),
YAML_STRING("ttsLanguage", 2),
YAML_STRING("uiLanguage", 2),
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
radio/src/storage/yaml/yaml_datastructs_pl18.cpp
+1
View File
@@ -399,6 +399,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "jackMode", 2 ),
YAML_PADDING( 1 ),
YAML_STRING("ttsLanguage", 2),
YAML_STRING("uiLanguage", 2),
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
radio/src/storage/yaml/yaml_datastructs_pl18u.cpp
+1
View File
@@ -392,6 +392,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "jackMode", 2 ),
YAML_PADDING( 1 ),
YAML_STRING("ttsLanguage", 2),
YAML_STRING("uiLanguage", 2),
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
radio/src/storage/yaml/yaml_datastructs_st16.cpp
+1
View File
@@ -422,6 +422,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "jackMode", 2 ),
YAML_PADDING( 1 ),
YAML_STRING("ttsLanguage", 2),
YAML_STRING("uiLanguage", 2),
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
radio/src/storage/yaml/yaml_datastructs_t15.cpp
+1
View File
@@ -407,6 +407,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "jackMode", 2 ),
YAML_PADDING( 1 ),
YAML_STRING("ttsLanguage", 2),
YAML_STRING("uiLanguage", 2),
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
radio/src/storage/yaml/yaml_datastructs_t15pro.cpp
+1
View File
@@ -422,6 +422,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "jackMode", 2 ),
YAML_PADDING( 1 ),
YAML_STRING("ttsLanguage", 2),
YAML_STRING("uiLanguage", 2),
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
radio/src/storage/yaml/yaml_datastructs_t20.cpp
+1
View File
@@ -352,6 +352,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "jackMode", 2 ),
YAML_PADDING( 1 ),
YAML_STRING("ttsLanguage", 2),
YAML_STRING("uiLanguage", 2),
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
radio/src/storage/yaml/yaml_datastructs_tpro.cpp
+1
View File
@@ -352,6 +352,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "jackMode", 2 ),
YAML_PADDING( 1 ),
YAML_STRING("ttsLanguage", 2),
YAML_STRING("uiLanguage", 2),
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
radio/src/storage/yaml/yaml_datastructs_tx15.cpp
+1
View File
@@ -422,6 +422,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "jackMode", 2 ),
YAML_PADDING( 1 ),
YAML_STRING("ttsLanguage", 2),
YAML_STRING("uiLanguage", 2),
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
radio/src/storage/yaml/yaml_datastructs_x10.cpp
+1
View File
@@ -398,6 +398,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "jackMode", 2 ),
YAML_PADDING( 1 ),
YAML_STRING("ttsLanguage", 2),
YAML_STRING("uiLanguage", 2),
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
radio/src/storage/yaml/yaml_datastructs_x9d.cpp
+1
View File
@@ -343,6 +343,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "jackMode", 2 ),
YAML_PADDING( 1 ),
YAML_STRING("ttsLanguage", 2),
YAML_STRING("uiLanguage", 2),
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
radio/src/storage/yaml/yaml_datastructs_x9dp2019.cpp
+1
View File
@@ -343,6 +343,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "jackMode", 2 ),
YAML_PADDING( 1 ),
YAML_STRING("ttsLanguage", 2),
YAML_STRING("uiLanguage", 2),
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
radio/src/storage/yaml/yaml_datastructs_x9e.cpp
+1
View File
@@ -343,6 +343,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "jackMode", 2 ),
YAML_PADDING( 1 ),
YAML_STRING("ttsLanguage", 2),
YAML_STRING("uiLanguage", 2),
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
radio/src/storage/yaml/yaml_datastructs_xlite.cpp
+1
View File
@@ -343,6 +343,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "jackMode", 2 ),
YAML_PADDING( 1 ),
YAML_STRING("ttsLanguage", 2),
YAML_STRING("uiLanguage", 2),
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
radio/src/storage/yaml/yaml_datastructs_xlites.cpp
+1
View File
@@ -345,6 +345,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "jackMode", 2 ),
YAML_PADDING( 1 ),
YAML_STRING("ttsLanguage", 2),
YAML_STRING("uiLanguage", 2),
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
radio/src/translations/i18n/cn.h
+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 "编辑"
radio/src/translations/i18n/cz.h
+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"
radio/src/translations/i18n/da.h
+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"
radio/src/translations/i18n/de.h
+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"
radio/src/translations/i18n/en.h
+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"
radio/src/translations/i18n/es.h
+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"
radio/src/translations/i18n/fi.h
+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"
radio/src/translations/i18n/fr.h
+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"
radio/src/translations/i18n/he.h
+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 "ערוך"
radio/src/translations/i18n/it.h
+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"
radio/src/translations/i18n/jp.h
+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 "編集"
radio/src/translations/i18n/ko.h
+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 "편집"
radio/src/translations/i18n/nl.h
+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"
radio/src/translations/i18n/pl.h
+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"
radio/src/translations/i18n/pt.h
+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"
radio/src/translations/i18n/ru.h
+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 "Редактировать"
radio/src/translations/i18n/se.h
+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"
radio/src/translations/i18n/tw.h
+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 "編輯"
radio/src/translations/i18n/ua.h
+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 "Редагувати"
radio/src/translations/sim_string_list.h
+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
radio/src/translations/string_list.h
+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)
radio/src/translations/translations.cpp
+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[] = {
radio/src/translations/translations.h
+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
radio/src/translations/tts/tts.h
+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,