feat: add a separate setting for selecting 'text language' when ALL_LANGS is set (#6960)
This commit is contained in:
@@ -292,6 +292,7 @@ Node convert<GeneralSettings>::encode(const GeneralSettings& rhs)
|
|||||||
node["imperial"] = rhs.imperial;
|
node["imperial"] = rhs.imperial;
|
||||||
node["ppmunit"] = rhs.ppmunit;
|
node["ppmunit"] = rhs.ppmunit;
|
||||||
node["ttsLanguage"] = rhs.ttsLanguage;
|
node["ttsLanguage"] = rhs.ttsLanguage;
|
||||||
|
node["uiLanguage"] = rhs.uiLanguage;
|
||||||
node["beepVolume"] = rhs.beepVolume + 2;
|
node["beepVolume"] = rhs.beepVolume + 2;
|
||||||
node["wavVolume"] = rhs.wavVolume + 2;
|
node["wavVolume"] = rhs.wavVolume + 2;
|
||||||
node["varioVolume"] = rhs.varioVolume + 2;
|
node["varioVolume"] = rhs.varioVolume + 2;
|
||||||
@@ -573,6 +574,7 @@ bool convert<GeneralSettings>::decode(const Node& node, GeneralSettings& rhs)
|
|||||||
node["imperial"] >> rhs.imperial;
|
node["imperial"] >> rhs.imperial;
|
||||||
node["ppmunit"] >> rhs.ppmunit;
|
node["ppmunit"] >> rhs.ppmunit;
|
||||||
node["ttsLanguage"] >> rhs.ttsLanguage;
|
node["ttsLanguage"] >> rhs.ttsLanguage;
|
||||||
|
node["uiLanguage"] >> rhs.uiLanguage;
|
||||||
node["beepVolume"] >> ioffset_int(rhs.beepVolume, 2);
|
node["beepVolume"] >> ioffset_int(rhs.beepVolume, 2);
|
||||||
node["wavVolume"] >> ioffset_int(rhs.wavVolume, 2);
|
node["wavVolume"] >> ioffset_int(rhs.wavVolume, 2);
|
||||||
node["varioVolume"] >> ioffset_int(rhs.varioVolume, 2);
|
node["varioVolume"] >> ioffset_int(rhs.varioVolume, 2);
|
||||||
|
|||||||
@@ -233,12 +233,14 @@ void GeneralSettings::init()
|
|||||||
internalModule = g.profile[g.sessionId()].defaultInternalModule();
|
internalModule = g.profile[g.sessionId()].defaultInternalModule();
|
||||||
|
|
||||||
QString lang = getCurrentFirmware()->getLanguage();
|
QString lang = getCurrentFirmware()->getLanguage();
|
||||||
if (lang.size() > 1)
|
if (lang.size() > 1) {
|
||||||
memcpy(ttsLanguage, lang.toLatin1().data(), 2);
|
memcpy(ttsLanguage, lang.toLatin1().data(), 2);
|
||||||
else {
|
} else {
|
||||||
ttsLanguage[0] = 'e';
|
ttsLanguage[0] = 'e';
|
||||||
ttsLanguage[1] = 'n';
|
ttsLanguage[1] = 'n';
|
||||||
}
|
}
|
||||||
|
ttsLanguage[2] = 0;
|
||||||
|
memcpy(uiLanguage, ttsLanguage, 3);
|
||||||
|
|
||||||
stickDeadZone = (IS_FLYSKY_NV14(board) || IS_FAMILY_PL18(board)) ? 2 : 0;
|
stickDeadZone = (IS_FLYSKY_NV14(board) || IS_FAMILY_PL18(board)) ? 2 : 0;
|
||||||
setDefaultFavorites();
|
setDefaultFavorites();
|
||||||
|
|||||||
@@ -367,6 +367,7 @@ class GeneralSettings {
|
|||||||
unsigned int imperial;
|
unsigned int imperial;
|
||||||
unsigned int ppmunit;
|
unsigned int ppmunit;
|
||||||
char ttsLanguage[TTS_LANGUAGE_LEN + 1];
|
char ttsLanguage[TTS_LANGUAGE_LEN + 1];
|
||||||
|
char uiLanguage[TTS_LANGUAGE_LEN + 1];
|
||||||
int beepVolume;
|
int beepVolume;
|
||||||
int wavVolume;
|
int wavVolume;
|
||||||
int varioVolume;
|
int varioVolume;
|
||||||
|
|||||||
@@ -115,8 +115,9 @@ ui(new Ui::GeneralSetup)
|
|||||||
ui->voiceLang_CB->hide();
|
ui->voiceLang_CB->hide();
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
populateVoiceLangCB();
|
populateVoiceLangCB(ui->voiceLang_CB, generalSettings.ttsLanguage);
|
||||||
}
|
}
|
||||||
|
populateTextLangCB(ui->textLang_CB, generalSettings.uiLanguage, Boards::getCapability(board, Board::HasColorLcd));
|
||||||
|
|
||||||
if (!firmware->getCapability(MavlinkTelemetry)) {
|
if (!firmware->getCapability(MavlinkTelemetry)) {
|
||||||
ui->mavbaud_CB->hide();
|
ui->mavbaud_CB->hide();
|
||||||
@@ -124,7 +125,6 @@ ui(new Ui::GeneralSetup)
|
|||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
ui->mavbaud_CB->setCurrentIndex(generalSettings.mavbaud);
|
ui->mavbaud_CB->setCurrentIndex(generalSettings.mavbaud);
|
||||||
// TODO why ??? populateVoiceLangCB(ui->voiceLang_CB, generalSettings.ttsLanguage);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!firmware->getCapability(HasSoundMixer)) {
|
if (!firmware->getCapability(HasSoundMixer)) {
|
||||||
@@ -396,38 +396,130 @@ void GeneralSetupPanel::on_timezoneLE_textEdited(const QString &text)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void GeneralSetupPanel::populateVoiceLangCB()
|
// Copied from tts.h
|
||||||
|
enum RadioLanguage {
|
||||||
|
LANG_CN,
|
||||||
|
LANG_CZ,
|
||||||
|
LANG_DA,
|
||||||
|
LANG_DE,
|
||||||
|
LANG_EN,
|
||||||
|
LANG_ES,
|
||||||
|
LANG_FI,
|
||||||
|
LANG_FR,
|
||||||
|
LANG_HE,
|
||||||
|
LANG_HU,
|
||||||
|
LANG_IT,
|
||||||
|
LANG_JP,
|
||||||
|
LANG_KO,
|
||||||
|
LANG_NL,
|
||||||
|
LANG_PL,
|
||||||
|
LANG_PT,
|
||||||
|
LANG_RU,
|
||||||
|
LANG_SE,
|
||||||
|
LANG_SK,
|
||||||
|
LANG_TW,
|
||||||
|
LANG_UA,
|
||||||
|
LANG_COUNT
|
||||||
|
};
|
||||||
|
|
||||||
|
// Order must match RadioLanguage
|
||||||
|
// Note: these align with the radio NOT computer locales - TODO harmonise with ISO and one list!!!
|
||||||
|
static const char* langStrings[][2] = {
|
||||||
|
{ "Chinese", "cn" },
|
||||||
|
{ "Czech", "cz" },
|
||||||
|
{ "Danish", "da" },
|
||||||
|
{ "German", "de" },
|
||||||
|
{ "English", "en" },
|
||||||
|
{ "Spanish", "es" },
|
||||||
|
{ "Finnish", "fi" },
|
||||||
|
{ "French", "fr" },
|
||||||
|
{ "Hebrew", "he" },
|
||||||
|
{ "Hungarian", "hu" },
|
||||||
|
{ "Italian", "it" },
|
||||||
|
{ "Japanese", "jp" },
|
||||||
|
{ "Korean", "ko" },
|
||||||
|
{ "Dutch", "nl" },
|
||||||
|
{ "Polish", "pl" },
|
||||||
|
{ "Portuguese", "pt" },
|
||||||
|
{ "Russian", "ru" },
|
||||||
|
{ "Swedish", "se" },
|
||||||
|
{ "Slovak", "sk" },
|
||||||
|
{ "Taiwanese", "tw" },
|
||||||
|
{ "Ukrainian", "ua" },
|
||||||
|
};
|
||||||
|
|
||||||
|
void GeneralSetupPanel::populateVoiceLangCB(QComboBox* b, const char* currLang)
|
||||||
{
|
{
|
||||||
QComboBox * b = ui->voiceLang_CB;
|
b->clear();
|
||||||
// Note: these align with the radio NOT computer locales - TODO harmonise with ISO and one list!!!
|
for (int i = 0; i < LANG_COUNT; i++) {
|
||||||
static QString strings[][2] = {
|
b->addItem(tr(langStrings[i][0]), langStrings[i][1]);
|
||||||
{ tr("Chinese"), "cn" },
|
if (strncmp(currLang, langStrings[i][1], 2) == 0) {
|
||||||
{ tr("Czech"), "cz" },
|
b->setCurrentIndex(b->count() - 1);
|
||||||
{ tr("Danish"), "da" },
|
}
|
||||||
{ tr("Dutch"), "nl" },
|
}
|
||||||
{ tr("English"), "en" },
|
}
|
||||||
{ tr("Finnish"), "fi" },
|
|
||||||
{ tr("French"), "fr" },
|
void GeneralSetupPanel::populateTextLangCB(QComboBox* b, const char* currLang, bool isColor)
|
||||||
{ tr("German"), "de" },
|
{
|
||||||
{ tr("Hebrew"), "he" },
|
// Available text languages
|
||||||
{ tr("Hungarian"), "hu" },
|
// B&W
|
||||||
{ tr("Italian"), "it" },
|
static RadioLanguage bwLangs[] = {
|
||||||
{ tr("Japanese"), "jp" },
|
// LANG_CN, // no fonts
|
||||||
{ tr("Korean"), "ko" },
|
LANG_CZ,
|
||||||
{ tr("Polish"), "pl" },
|
LANG_DA,
|
||||||
{ tr("Portuguese"), "pt" },
|
LANG_DE,
|
||||||
{ tr("Russian"), "ru" },
|
LANG_EN,
|
||||||
{ tr("Slovak"), "sk" },
|
LANG_ES,
|
||||||
{ tr("Spanish"), "es" },
|
LANG_FI,
|
||||||
{ tr("Swedish"), "se" },
|
LANG_FR,
|
||||||
{ tr("Taiwanese"), "tw" },
|
// LANG_HE, // no fonts
|
||||||
{ tr("Ukrainian"), "ua" },
|
// LANG_HU, // no translation file
|
||||||
{ NULL, NULL }};
|
LANG_IT,
|
||||||
|
// LANG_JP, // no fonts
|
||||||
|
// LANG_KO, // no fonts
|
||||||
|
LANG_NL,
|
||||||
|
LANG_PL,
|
||||||
|
LANG_PT,
|
||||||
|
LANG_RU,
|
||||||
|
LANG_SE,
|
||||||
|
// LANG_SK, // no translation file
|
||||||
|
// LANG_TW, // no fonts
|
||||||
|
LANG_UA,
|
||||||
|
LANG_COUNT
|
||||||
|
};
|
||||||
|
// Color
|
||||||
|
static RadioLanguage colorLangs[] = {
|
||||||
|
LANG_CN,
|
||||||
|
LANG_CZ,
|
||||||
|
LANG_DA,
|
||||||
|
LANG_DE,
|
||||||
|
LANG_EN,
|
||||||
|
LANG_ES,
|
||||||
|
LANG_FI,
|
||||||
|
LANG_FR,
|
||||||
|
LANG_HE,
|
||||||
|
// LANG_HU, // no translation file
|
||||||
|
LANG_IT,
|
||||||
|
LANG_JP,
|
||||||
|
LANG_KO,
|
||||||
|
LANG_NL,
|
||||||
|
LANG_PL,
|
||||||
|
LANG_PT,
|
||||||
|
LANG_RU,
|
||||||
|
LANG_SE,
|
||||||
|
// LANG_SK, // no translation file
|
||||||
|
LANG_TW,
|
||||||
|
LANG_UA,
|
||||||
|
LANG_COUNT
|
||||||
|
};
|
||||||
|
|
||||||
|
RadioLanguage* langs = isColor ? colorLangs : bwLangs;
|
||||||
|
|
||||||
b->clear();
|
b->clear();
|
||||||
for (int i = 0; !strings[i][0].isNull(); i++) {
|
for (int i = 0; langs[i] < LANG_COUNT; i++) {
|
||||||
b->addItem(strings[i][0],strings[i][1]);
|
int n = langs[i];
|
||||||
if (generalSettings.ttsLanguage == strings[i][1]) {
|
b->addItem(tr(langStrings[n][0]),langStrings[n][1]);
|
||||||
|
if (strncmp(currLang, langStrings[n][1], 2) == 0) {
|
||||||
b->setCurrentIndex(b->count() - 1);
|
b->setCurrentIndex(b->count() - 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -485,6 +577,18 @@ void GeneralSetupPanel::on_voiceLang_CB_currentIndexChanged(int index)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void GeneralSetupPanel::on_textLang_CB_currentIndexChanged(int index)
|
||||||
|
{
|
||||||
|
if (!lock) {
|
||||||
|
QString code = ui->textLang_CB->itemData(index).toString();
|
||||||
|
for (int i = 0; i < 2; i++) {
|
||||||
|
generalSettings.uiLanguage[i] = code.at(i).toLatin1();
|
||||||
|
}
|
||||||
|
generalSettings.uiLanguage[2] = '\0';
|
||||||
|
emit modified();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void GeneralSetupPanel::updateVarioPitchRange()
|
void GeneralSetupPanel::updateVarioPitchRange()
|
||||||
{
|
{
|
||||||
ui->varioPMax_SB->setMaximum(700 + (generalSettings.varioPitch * 10) + 1000 + 800);
|
ui->varioPMax_SB->setMaximum(700 + (generalSettings.varioPitch * 10) + 1000 + 800);
|
||||||
|
|||||||
@@ -68,6 +68,7 @@ class GeneralSetupPanel : public GeneralPanel
|
|||||||
void on_backlightColor_SL_valueChanged();
|
void on_backlightColor_SL_valueChanged();
|
||||||
void on_mavbaud_CB_currentIndexChanged(int index);
|
void on_mavbaud_CB_currentIndexChanged(int index);
|
||||||
void on_voiceLang_CB_currentIndexChanged(int index);
|
void on_voiceLang_CB_currentIndexChanged(int index);
|
||||||
|
void on_textLang_CB_currentIndexChanged(int index);
|
||||||
void stickReverseEdited();
|
void stickReverseEdited();
|
||||||
void on_switchesDelay_valueChanged(int);
|
void on_switchesDelay_valueChanged(int);
|
||||||
void on_blAlarm_ChkB_stateChanged();
|
void on_blAlarm_ChkB_stateChanged();
|
||||||
@@ -113,6 +114,7 @@ class GeneralSetupPanel : public GeneralPanel
|
|||||||
void showLabelSelectOptions();
|
void showLabelSelectOptions();
|
||||||
|
|
||||||
void setValues();
|
void setValues();
|
||||||
void populateVoiceLangCB();
|
void populateVoiceLangCB(QComboBox* b, const char* currLang);
|
||||||
|
void populateTextLangCB(QComboBox* b, const char* currLang, bool isColor);
|
||||||
void updateVarioPitchRange();
|
void updateVarioPitchRange();
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -576,7 +576,7 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="29" column="1">
|
<item row="30" column="1">
|
||||||
<widget class="QComboBox" name="labelMultiMode_CB">
|
<widget class="QComboBox" name="labelMultiMode_CB">
|
||||||
<item>
|
<item>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
@@ -590,7 +590,7 @@
|
|||||||
</item>
|
</item>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="26" column="1">
|
<item row="27" column="1">
|
||||||
<widget class="QCheckBox" name="modelQuickSelect_CB">
|
<widget class="QCheckBox" name="modelQuickSelect_CB">
|
||||||
<property name="toolTip">
|
<property name="toolTip">
|
||||||
<string>Enable this to quickly change model on the model select page (a long press can then be used to open the model edit menu).</string>
|
<string>Enable this to quickly change model on the model select page (a long press can then be used to open the model edit menu).</string>
|
||||||
@@ -621,14 +621,14 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="24" column="0">
|
<item row="25" column="0">
|
||||||
<widget class="QLabel" name="label_registrationId">
|
<widget class="QLabel" name="label_registrationId">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Owner Registration ID</string>
|
<string>Owner Registration ID</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="28" column="0">
|
<item row="29" column="0">
|
||||||
<widget class="QLabel" name="label_labelSingleSelect">
|
<widget class="QLabel" name="label_labelSingleSelect">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Label selection mode</string>
|
<string>Label selection mode</string>
|
||||||
@@ -662,7 +662,7 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="29" column="0">
|
<item row="30" column="0">
|
||||||
<widget class="QLabel" name="label_labelMultiMode">
|
<widget class="QLabel" name="label_labelMultiMode">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Label matching</string>
|
<string>Label matching</string>
|
||||||
@@ -692,7 +692,7 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="28" column="1">
|
<item row="29" column="1">
|
||||||
<widget class="QComboBox" name="labelSingleSelect_CB">
|
<widget class="QComboBox" name="labelSingleSelect_CB">
|
||||||
<item>
|
<item>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
@@ -706,7 +706,7 @@
|
|||||||
</item>
|
</item>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="31" column="0">
|
<item row="32" column="0">
|
||||||
<spacer name="verticalSpacer_3">
|
<spacer name="verticalSpacer_3">
|
||||||
<property name="orientation">
|
<property name="orientation">
|
||||||
<enum>Qt::Orientation::Vertical</enum>
|
<enum>Qt::Orientation::Vertical</enum>
|
||||||
@@ -822,7 +822,7 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="27" column="1">
|
<item row="28" column="1">
|
||||||
<widget class="QComboBox" name="modelSelectLayout_CB">
|
<widget class="QComboBox" name="modelSelectLayout_CB">
|
||||||
<item>
|
<item>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
@@ -874,7 +874,7 @@
|
|||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</item>
|
</item>
|
||||||
<item row="25" column="1">
|
<item row="26" column="1">
|
||||||
<widget class="QComboBox" name="rotEncMode_CB"/>
|
<widget class="QComboBox" name="rotEncMode_CB"/>
|
||||||
</item>
|
</item>
|
||||||
<item row="0" column="1">
|
<item row="0" column="1">
|
||||||
@@ -908,7 +908,7 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="24" column="1">
|
<item row="25" column="1">
|
||||||
<widget class="QLineEdit" name="registrationId">
|
<widget class="QLineEdit" name="registrationId">
|
||||||
<property name="maxLength">
|
<property name="maxLength">
|
||||||
<number>8</number>
|
<number>8</number>
|
||||||
@@ -929,6 +929,13 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item row="24" column="0">
|
||||||
|
<widget class="QLabel" name="TextLang_label">
|
||||||
|
<property name="text">
|
||||||
|
<string>Text Language</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
<item row="1" column="0">
|
<item row="1" column="0">
|
||||||
<widget class="QLabel" name="label_speakerPitch">
|
<widget class="QLabel" name="label_speakerPitch">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
@@ -999,7 +1006,10 @@
|
|||||||
<item row="23" column="1">
|
<item row="23" column="1">
|
||||||
<widget class="QComboBox" name="voiceLang_CB"/>
|
<widget class="QComboBox" name="voiceLang_CB"/>
|
||||||
</item>
|
</item>
|
||||||
<item row="30" column="1">
|
<item row="24" column="1">
|
||||||
|
<widget class="QComboBox" name="textLang_CB"/>
|
||||||
|
</item>
|
||||||
|
<item row="31" column="1">
|
||||||
<widget class="QComboBox" name="favMultiMode_CB">
|
<widget class="QComboBox" name="favMultiMode_CB">
|
||||||
<item>
|
<item>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
@@ -1102,7 +1112,7 @@
|
|||||||
</item>
|
</item>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="27" column="0">
|
<item row="28" column="0">
|
||||||
<widget class="QLabel" name="label_modelSelectLayout">
|
<widget class="QLabel" name="label_modelSelectLayout">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Manage Models layout</string>
|
<string>Manage Models layout</string>
|
||||||
@@ -1125,7 +1135,7 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="25" column="0">
|
<item row="26" column="0">
|
||||||
<widget class="QLabel" name="rotEncMode_label">
|
<widget class="QLabel" name="rotEncMode_label">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Rotary Encoder Mode</string>
|
<string>Rotary Encoder Mode</string>
|
||||||
@@ -1148,7 +1158,7 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="26" column="0">
|
<item row="27" column="0">
|
||||||
<widget class="QLabel" name="label_modelQuickSelect">
|
<widget class="QLabel" name="label_modelQuickSelect">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Model quick select</string>
|
<string>Model quick select</string>
|
||||||
@@ -1203,7 +1213,7 @@ p, li { white-space: pre-wrap; }
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="30" column="0">
|
<item row="31" column="0">
|
||||||
<widget class="QLabel" name="label_favMultiMode">
|
<widget class="QLabel" name="label_favMultiMode">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Favorites matching</string>
|
<string>Favorites matching</string>
|
||||||
|
|||||||
@@ -77,15 +77,15 @@ static inline void check_struct()
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(PCBXLITES)
|
#if defined(PCBXLITES)
|
||||||
CHKSIZE(RadioData, 948);
|
CHKSIZE(RadioData, 950);
|
||||||
#elif defined(RADIO_ST16) || defined(PCBPA01) || defined(RADIO_TX15) || defined(RADIO_T15PRO)
|
#elif defined(RADIO_ST16) || defined(PCBPA01) || defined(RADIO_TX15) || defined(RADIO_T15PRO)
|
||||||
CHKSIZE(RadioData, 1179);
|
CHKSIZE(RadioData, 1181);
|
||||||
#elif defined(COLORLCD)
|
#elif defined(COLORLCD)
|
||||||
CHKSIZE(RadioData, 1059);
|
CHKSIZE(RadioData, 1061);
|
||||||
#elif defined(RADIO_GX12)
|
#elif defined(RADIO_GX12)
|
||||||
CHKSIZE(RadioData, 1066);
|
CHKSIZE(RadioData, 1068);
|
||||||
#else
|
#else
|
||||||
CHKSIZE(RadioData, 946);
|
CHKSIZE(RadioData, 948);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(RADIO_TPRO) || defined(RADIO_TPROV2) || defined(RADIO_BUMBLEBEE)
|
#if defined(RADIO_TPRO) || defined(RADIO_TPROV2) || defined(RADIO_BUMBLEBEE)
|
||||||
|
|||||||
@@ -1079,6 +1079,7 @@ PACK(struct RadioData {
|
|||||||
NOBACKUP(uint8_t sportUpdatePower:1 SKIP);
|
NOBACKUP(uint8_t sportUpdatePower:1 SKIP);
|
||||||
|
|
||||||
NOBACKUP(char ttsLanguage[2]);
|
NOBACKUP(char ttsLanguage[2]);
|
||||||
|
NOBACKUP(char uiLanguage[2]);
|
||||||
NOBACKUP(int8_t beepVolume:4 CUST(r_5pos,w_5pos));
|
NOBACKUP(int8_t beepVolume:4 CUST(r_5pos,w_5pos));
|
||||||
NOBACKUP(int8_t wavVolume: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));
|
NOBACKUP(int8_t varioVolume:4 CUST(r_5pos,w_5pos));
|
||||||
|
|||||||
@@ -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()
|
void generalDefault()
|
||||||
{
|
{
|
||||||
memclear(&g_eeGeneral, sizeof(g_eeGeneral));
|
memclear(&g_eeGeneral, sizeof(g_eeGeneral));
|
||||||
@@ -365,6 +372,7 @@ void generalDefault()
|
|||||||
g_eeGeneral.lightAutoOff = 2;
|
g_eeGeneral.lightAutoOff = 2;
|
||||||
g_eeGeneral.inactivityTimer = 10;
|
g_eeGeneral.inactivityTimer = 10;
|
||||||
|
|
||||||
|
generalDefaultUILanguage();
|
||||||
g_eeGeneral.ttsLanguage[0] = 'e';
|
g_eeGeneral.ttsLanguage[0] = 'e';
|
||||||
g_eeGeneral.ttsLanguage[1] = 'n';
|
g_eeGeneral.ttsLanguage[1] = 'n';
|
||||||
g_eeGeneral.wavVolume = 2;
|
g_eeGeneral.wavVolume = 2;
|
||||||
|
|||||||
@@ -348,6 +348,7 @@ uint16_t isqrt32(uint32_t n);
|
|||||||
void setDefaultOwnerId();
|
void setDefaultOwnerId();
|
||||||
void generalDefault();
|
void generalDefault();
|
||||||
void generalDefaultSwitches();
|
void generalDefaultSwitches();
|
||||||
|
void generalDefaultUILanguage();
|
||||||
|
|
||||||
uint32_t hash(const void * ptr, uint32_t size);
|
uint32_t hash(const void * ptr, uint32_t size);
|
||||||
|
|
||||||
|
|||||||
@@ -99,7 +99,10 @@ enum {
|
|||||||
CASE_GPS(ITEM_RADIO_SETUP_ADJUST_RTC)
|
CASE_GPS(ITEM_RADIO_SETUP_ADJUST_RTC)
|
||||||
CASE_GPS(ITEM_RADIO_SETUP_GPSFORMAT)
|
CASE_GPS(ITEM_RADIO_SETUP_GPSFORMAT)
|
||||||
CASE_PXX1(ITEM_RADIO_SETUP_COUNTRYCODE)
|
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_IMPERIAL,
|
||||||
ITEM_RADIO_SETUP_PPM,
|
ITEM_RADIO_SETUP_PPM,
|
||||||
IF_FAI_CHOICE(ITEM_RADIO_SETUP_FAI)
|
IF_FAI_CHOICE(ITEM_RADIO_SETUP_FAI)
|
||||||
@@ -238,6 +241,9 @@ void menuRadioSetup(event_t event)
|
|||||||
CASE_GPS(0)
|
CASE_GPS(0)
|
||||||
CASE_PXX1(0)
|
CASE_PXX1(0)
|
||||||
0, 0, 0,
|
0, 0, 0,
|
||||||
|
#if defined(ALL_LANGS)
|
||||||
|
0, // text language
|
||||||
|
#endif
|
||||||
IF_FAI_CHOICE(0)
|
IF_FAI_CHOICE(0)
|
||||||
0,
|
0,
|
||||||
0, // USB mode
|
0, // USB mode
|
||||||
@@ -708,7 +714,7 @@ void menuRadioSetup(event_t event)
|
|||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
case ITEM_RADIO_SETUP_LANGUAGE:
|
case ITEM_RADIO_SETUP_VOICE_LANGUAGE:
|
||||||
lcdDrawTextAlignedLeft(y, STR_VOICE_LANGUAGE);
|
lcdDrawTextAlignedLeft(y, STR_VOICE_LANGUAGE);
|
||||||
#if !defined(ALL_LANGS)
|
#if !defined(ALL_LANGS)
|
||||||
lcdDrawText(LCD_W-2, y, currentLanguagePack->name, attr|RIGHT);
|
lcdDrawText(LCD_W-2, y, currentLanguagePack->name, attr|RIGHT);
|
||||||
@@ -720,15 +726,27 @@ void menuRadioSetup(event_t event)
|
|||||||
if (checkIncDec_Ret) {
|
if (checkIncDec_Ret) {
|
||||||
currentLanguagePack = languagePacks[currentLanguagePackIdx];
|
currentLanguagePack = languagePacks[currentLanguagePackIdx];
|
||||||
strncpy(g_eeGeneral.ttsLanguage, currentLanguagePack->id, 2);
|
strncpy(g_eeGeneral.ttsLanguage, currentLanguagePack->id, 2);
|
||||||
#if defined(ALL_LANGS)
|
|
||||||
currentLangStrings = langStrings[currentLanguagePackIdx];
|
|
||||||
extern void setLanguageFont(int n);
|
|
||||||
setLanguageFont(currentLanguagePackIdx);
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
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:
|
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);
|
g_eeGeneral.imperial = editChoice(LCD_W-2, y, STR_UNITS_SYSTEM, STR_VUNITSSYSTEM, g_eeGeneral.imperial, 0, 1, attr|RIGHT, event);
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -98,7 +98,10 @@ enum MenuRadioSetupItems {
|
|||||||
CASE_GPS(ITEM_RADIO_SETUP_ADJUST_RTC)
|
CASE_GPS(ITEM_RADIO_SETUP_ADJUST_RTC)
|
||||||
CASE_GPS(ITEM_RADIO_SETUP_GPSFORMAT)
|
CASE_GPS(ITEM_RADIO_SETUP_GPSFORMAT)
|
||||||
CASE_PXX1(ITEM_RADIO_SETUP_COUNTRYCODE)
|
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_IMPERIAL,
|
||||||
ITEM_RADIO_SETUP_PPM,
|
ITEM_RADIO_SETUP_PPM,
|
||||||
IF_FAI_CHOICE(ITEM_RADIO_SETUP_FAI)
|
IF_FAI_CHOICE(ITEM_RADIO_SETUP_FAI)
|
||||||
@@ -238,6 +241,9 @@ void menuRadioSetup(event_t event)
|
|||||||
CASE_GPS(0)
|
CASE_GPS(0)
|
||||||
CASE_PXX1(0) // country code
|
CASE_PXX1(0) // country code
|
||||||
0, // voice language
|
0, // voice language
|
||||||
|
#if defined(ALL_LANGS)
|
||||||
|
0, // text language
|
||||||
|
#endif
|
||||||
0, // imperial
|
0, // imperial
|
||||||
0, // PPM unit
|
0, // PPM unit
|
||||||
IF_FAI_CHOICE(0)
|
IF_FAI_CHOICE(0)
|
||||||
@@ -679,7 +685,7 @@ void menuRadioSetup(event_t event)
|
|||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
case ITEM_RADIO_SETUP_LANGUAGE:
|
case ITEM_RADIO_SETUP_VOICE_LANGUAGE:
|
||||||
lcdDrawTextAlignedLeft(y, STR_VOICE_LANGUAGE);
|
lcdDrawTextAlignedLeft(y, STR_VOICE_LANGUAGE);
|
||||||
#if !defined(ALL_LANGS)
|
#if !defined(ALL_LANGS)
|
||||||
lcdDrawText(RADIO_SETUP_2ND_COLUMN, y, currentLanguagePack->name, attr);
|
lcdDrawText(RADIO_SETUP_2ND_COLUMN, y, currentLanguagePack->name, attr);
|
||||||
@@ -691,15 +697,27 @@ void menuRadioSetup(event_t event)
|
|||||||
if (checkIncDec_Ret) {
|
if (checkIncDec_Ret) {
|
||||||
currentLanguagePack = languagePacks[currentLanguagePackIdx];
|
currentLanguagePack = languagePacks[currentLanguagePackIdx];
|
||||||
strncpy(g_eeGeneral.ttsLanguage, currentLanguagePack->id, 2);
|
strncpy(g_eeGeneral.ttsLanguage, currentLanguagePack->id, 2);
|
||||||
#if defined(ALL_LANGS)
|
|
||||||
currentLangStrings = langStrings[currentLanguagePackIdx];
|
|
||||||
extern void setLanguageFont(int n);
|
|
||||||
setLanguageFont(currentLanguagePackIdx);
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
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:
|
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);
|
g_eeGeneral.imperial = editChoice(RADIO_SETUP_2ND_COLUMN, y, STR_UNITS_SYSTEM, STR_VUNITSSYSTEM, g_eeGeneral.imperial, 0, 1, attr, event);
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -852,19 +852,6 @@ static SetupLineDef setupLines[] = {
|
|||||||
currentLanguagePack = languagePacks[currentLanguagePackIdx];
|
currentLanguagePack = languagePacks[currentLanguagePackIdx];
|
||||||
strncpy(g_eeGeneral.ttsLanguage, currentLanguagePack->id, 2);
|
strncpy(g_eeGeneral.ttsLanguage, currentLanguagePack->id, 2);
|
||||||
SET_DIRTY();
|
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)
|
#if !defined(ALL_LANGS)
|
||||||
choice->setTextHandler(
|
choice->setTextHandler(
|
||||||
@@ -884,6 +871,44 @@ static SetupLineDef setupLines[] = {
|
|||||||
#endif
|
#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
|
// Imperial units
|
||||||
STR_DEF(STR_UNITS_SYSTEM),
|
STR_DEF(STR_UNITS_SYSTEM),
|
||||||
|
|||||||
@@ -1760,8 +1760,8 @@ static int luaGetGeneralSettings(lua_State * L)
|
|||||||
lua_pushtableinteger(L, "imperial", g_eeGeneral.imperial);
|
lua_pushtableinteger(L, "imperial", g_eeGeneral.imperial);
|
||||||
#if defined(ALL_LANGS)
|
#if defined(ALL_LANGS)
|
||||||
char l[3];
|
char l[3];
|
||||||
l[0] = toupper(g_eeGeneral.ttsLanguage[0]);
|
l[0] = toupper(g_eeGeneral.uiLanguage[0]);
|
||||||
l[1] = toupper(g_eeGeneral.ttsLanguage[1]);
|
l[1] = toupper(g_eeGeneral.uiLanguage[1]);
|
||||||
l[2] = 0;
|
l[2] = 0;
|
||||||
lua_pushtablestring(L, "language", l);
|
lua_pushtablestring(L, "language", l);
|
||||||
#else
|
#else
|
||||||
|
|||||||
@@ -112,8 +112,8 @@ void LuaWidgetFactory::translateOptions(WidgetOption * options)
|
|||||||
|
|
||||||
#if defined(ALL_LANGS)
|
#if defined(ALL_LANGS)
|
||||||
char lang[3];
|
char lang[3];
|
||||||
lang[0] = toupper(g_eeGeneral.ttsLanguage[0]);
|
lang[0] = toupper(g_eeGeneral.uiLanguage[0]);
|
||||||
lang[1] = toupper(g_eeGeneral.ttsLanguage[1]);
|
lang[1] = toupper(g_eeGeneral.uiLanguage[1]);
|
||||||
lang[2] = 0;
|
lang[2] = 0;
|
||||||
#else
|
#else
|
||||||
const char* lang = TRANSLATIONS;
|
const char* lang = TRANSLATIONS;
|
||||||
|
|||||||
@@ -243,18 +243,16 @@ void storageReadAll()
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
for (uint8_t i = 0; languagePacks[i] != nullptr; i++) {
|
if (g_eeGeneral.uiLanguage[0] == 0)
|
||||||
if (!strncmp(g_eeGeneral.ttsLanguage, languagePacks[i]->id, 2)) {
|
generalDefaultUILanguage();
|
||||||
currentLanguagePackIdx = i;
|
currentLanguagePackIdx = getLanguageId(g_eeGeneral.ttsLanguage);
|
||||||
currentLanguagePack = languagePacks[i];
|
currentLanguagePack = languagePacks[currentLanguagePackIdx];
|
||||||
#if defined(ALL_LANGS)
|
#if defined(ALL_LANGS)
|
||||||
currentLangStrings = langStrings[currentLanguagePackIdx];
|
uint8_t uiLangIdx = getLanguageId(g_eeGeneral.uiLanguage);
|
||||||
extern void setLanguageFont(int n);
|
currentLangStrings = langStrings[uiLangIdx];
|
||||||
setLanguageFont(currentLanguagePackIdx);
|
extern void setLanguageFont(int n);
|
||||||
|
setLanguageFont(uiLangIdx);
|
||||||
#endif
|
#endif
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#if defined(STORAGE_MODELSLIST)
|
#if defined(STORAGE_MODELSLIST)
|
||||||
// and reload the list
|
// and reload the list
|
||||||
|
|||||||
@@ -343,6 +343,7 @@ static const struct YamlNode struct_RadioData[] = {
|
|||||||
YAML_UNSIGNED( "jackMode", 2 ),
|
YAML_UNSIGNED( "jackMode", 2 ),
|
||||||
YAML_PADDING( 1 ),
|
YAML_PADDING( 1 ),
|
||||||
YAML_STRING("ttsLanguage", 2),
|
YAML_STRING("ttsLanguage", 2),
|
||||||
|
YAML_STRING("uiLanguage", 2),
|
||||||
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
|
||||||
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
|
||||||
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
|
||||||
|
|||||||
@@ -399,6 +399,7 @@ static const struct YamlNode struct_RadioData[] = {
|
|||||||
YAML_UNSIGNED( "jackMode", 2 ),
|
YAML_UNSIGNED( "jackMode", 2 ),
|
||||||
YAML_PADDING( 1 ),
|
YAML_PADDING( 1 ),
|
||||||
YAML_STRING("ttsLanguage", 2),
|
YAML_STRING("ttsLanguage", 2),
|
||||||
|
YAML_STRING("uiLanguage", 2),
|
||||||
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
|
||||||
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
|
||||||
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
|
||||||
|
|||||||
@@ -367,6 +367,7 @@ static const struct YamlNode struct_RadioData[] = {
|
|||||||
YAML_UNSIGNED( "jackMode", 2 ),
|
YAML_UNSIGNED( "jackMode", 2 ),
|
||||||
YAML_PADDING( 1 ),
|
YAML_PADDING( 1 ),
|
||||||
YAML_STRING("ttsLanguage", 2),
|
YAML_STRING("ttsLanguage", 2),
|
||||||
|
YAML_STRING("uiLanguage", 2),
|
||||||
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
|
||||||
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
|
||||||
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
|
||||||
|
|||||||
@@ -392,6 +392,7 @@ static const struct YamlNode struct_RadioData[] = {
|
|||||||
YAML_UNSIGNED( "jackMode", 2 ),
|
YAML_UNSIGNED( "jackMode", 2 ),
|
||||||
YAML_PADDING( 1 ),
|
YAML_PADDING( 1 ),
|
||||||
YAML_STRING("ttsLanguage", 2),
|
YAML_STRING("ttsLanguage", 2),
|
||||||
|
YAML_STRING("uiLanguage", 2),
|
||||||
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
|
||||||
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
|
||||||
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
|
||||||
|
|||||||
@@ -399,6 +399,7 @@ static const struct YamlNode struct_RadioData[] = {
|
|||||||
YAML_UNSIGNED( "jackMode", 2 ),
|
YAML_UNSIGNED( "jackMode", 2 ),
|
||||||
YAML_PADDING( 1 ),
|
YAML_PADDING( 1 ),
|
||||||
YAML_STRING("ttsLanguage", 2),
|
YAML_STRING("ttsLanguage", 2),
|
||||||
|
YAML_STRING("uiLanguage", 2),
|
||||||
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
|
||||||
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
|
||||||
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
|
||||||
|
|||||||
@@ -422,6 +422,7 @@ static const struct YamlNode struct_RadioData[] = {
|
|||||||
YAML_UNSIGNED( "jackMode", 2 ),
|
YAML_UNSIGNED( "jackMode", 2 ),
|
||||||
YAML_PADDING( 1 ),
|
YAML_PADDING( 1 ),
|
||||||
YAML_STRING("ttsLanguage", 2),
|
YAML_STRING("ttsLanguage", 2),
|
||||||
|
YAML_STRING("uiLanguage", 2),
|
||||||
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
|
||||||
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
|
||||||
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
|
||||||
|
|||||||
@@ -399,6 +399,7 @@ static const struct YamlNode struct_RadioData[] = {
|
|||||||
YAML_UNSIGNED( "jackMode", 2 ),
|
YAML_UNSIGNED( "jackMode", 2 ),
|
||||||
YAML_PADDING( 1 ),
|
YAML_PADDING( 1 ),
|
||||||
YAML_STRING("ttsLanguage", 2),
|
YAML_STRING("ttsLanguage", 2),
|
||||||
|
YAML_STRING("uiLanguage", 2),
|
||||||
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
|
||||||
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
|
||||||
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
|
||||||
|
|||||||
@@ -392,6 +392,7 @@ static const struct YamlNode struct_RadioData[] = {
|
|||||||
YAML_UNSIGNED( "jackMode", 2 ),
|
YAML_UNSIGNED( "jackMode", 2 ),
|
||||||
YAML_PADDING( 1 ),
|
YAML_PADDING( 1 ),
|
||||||
YAML_STRING("ttsLanguage", 2),
|
YAML_STRING("ttsLanguage", 2),
|
||||||
|
YAML_STRING("uiLanguage", 2),
|
||||||
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
|
||||||
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
|
||||||
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
|
||||||
|
|||||||
@@ -422,6 +422,7 @@ static const struct YamlNode struct_RadioData[] = {
|
|||||||
YAML_UNSIGNED( "jackMode", 2 ),
|
YAML_UNSIGNED( "jackMode", 2 ),
|
||||||
YAML_PADDING( 1 ),
|
YAML_PADDING( 1 ),
|
||||||
YAML_STRING("ttsLanguage", 2),
|
YAML_STRING("ttsLanguage", 2),
|
||||||
|
YAML_STRING("uiLanguage", 2),
|
||||||
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
|
||||||
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
|
||||||
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
|
||||||
|
|||||||
@@ -407,6 +407,7 @@ static const struct YamlNode struct_RadioData[] = {
|
|||||||
YAML_UNSIGNED( "jackMode", 2 ),
|
YAML_UNSIGNED( "jackMode", 2 ),
|
||||||
YAML_PADDING( 1 ),
|
YAML_PADDING( 1 ),
|
||||||
YAML_STRING("ttsLanguage", 2),
|
YAML_STRING("ttsLanguage", 2),
|
||||||
|
YAML_STRING("uiLanguage", 2),
|
||||||
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
|
||||||
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
|
||||||
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
|
||||||
|
|||||||
@@ -422,6 +422,7 @@ static const struct YamlNode struct_RadioData[] = {
|
|||||||
YAML_UNSIGNED( "jackMode", 2 ),
|
YAML_UNSIGNED( "jackMode", 2 ),
|
||||||
YAML_PADDING( 1 ),
|
YAML_PADDING( 1 ),
|
||||||
YAML_STRING("ttsLanguage", 2),
|
YAML_STRING("ttsLanguage", 2),
|
||||||
|
YAML_STRING("uiLanguage", 2),
|
||||||
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
|
||||||
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
|
||||||
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
|
||||||
|
|||||||
@@ -352,6 +352,7 @@ static const struct YamlNode struct_RadioData[] = {
|
|||||||
YAML_UNSIGNED( "jackMode", 2 ),
|
YAML_UNSIGNED( "jackMode", 2 ),
|
||||||
YAML_PADDING( 1 ),
|
YAML_PADDING( 1 ),
|
||||||
YAML_STRING("ttsLanguage", 2),
|
YAML_STRING("ttsLanguage", 2),
|
||||||
|
YAML_STRING("uiLanguage", 2),
|
||||||
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
|
||||||
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
|
||||||
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
|
||||||
|
|||||||
@@ -352,6 +352,7 @@ static const struct YamlNode struct_RadioData[] = {
|
|||||||
YAML_UNSIGNED( "jackMode", 2 ),
|
YAML_UNSIGNED( "jackMode", 2 ),
|
||||||
YAML_PADDING( 1 ),
|
YAML_PADDING( 1 ),
|
||||||
YAML_STRING("ttsLanguage", 2),
|
YAML_STRING("ttsLanguage", 2),
|
||||||
|
YAML_STRING("uiLanguage", 2),
|
||||||
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
|
||||||
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
|
||||||
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
|
||||||
|
|||||||
@@ -422,6 +422,7 @@ static const struct YamlNode struct_RadioData[] = {
|
|||||||
YAML_UNSIGNED( "jackMode", 2 ),
|
YAML_UNSIGNED( "jackMode", 2 ),
|
||||||
YAML_PADDING( 1 ),
|
YAML_PADDING( 1 ),
|
||||||
YAML_STRING("ttsLanguage", 2),
|
YAML_STRING("ttsLanguage", 2),
|
||||||
|
YAML_STRING("uiLanguage", 2),
|
||||||
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
|
||||||
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
|
||||||
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
|
||||||
|
|||||||
@@ -398,6 +398,7 @@ static const struct YamlNode struct_RadioData[] = {
|
|||||||
YAML_UNSIGNED( "jackMode", 2 ),
|
YAML_UNSIGNED( "jackMode", 2 ),
|
||||||
YAML_PADDING( 1 ),
|
YAML_PADDING( 1 ),
|
||||||
YAML_STRING("ttsLanguage", 2),
|
YAML_STRING("ttsLanguage", 2),
|
||||||
|
YAML_STRING("uiLanguage", 2),
|
||||||
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
|
||||||
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
|
||||||
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
|
||||||
|
|||||||
@@ -343,6 +343,7 @@ static const struct YamlNode struct_RadioData[] = {
|
|||||||
YAML_UNSIGNED( "jackMode", 2 ),
|
YAML_UNSIGNED( "jackMode", 2 ),
|
||||||
YAML_PADDING( 1 ),
|
YAML_PADDING( 1 ),
|
||||||
YAML_STRING("ttsLanguage", 2),
|
YAML_STRING("ttsLanguage", 2),
|
||||||
|
YAML_STRING("uiLanguage", 2),
|
||||||
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
|
||||||
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
|
||||||
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
|
||||||
|
|||||||
@@ -343,6 +343,7 @@ static const struct YamlNode struct_RadioData[] = {
|
|||||||
YAML_UNSIGNED( "jackMode", 2 ),
|
YAML_UNSIGNED( "jackMode", 2 ),
|
||||||
YAML_PADDING( 1 ),
|
YAML_PADDING( 1 ),
|
||||||
YAML_STRING("ttsLanguage", 2),
|
YAML_STRING("ttsLanguage", 2),
|
||||||
|
YAML_STRING("uiLanguage", 2),
|
||||||
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
|
||||||
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
|
||||||
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
|
||||||
|
|||||||
@@ -343,6 +343,7 @@ static const struct YamlNode struct_RadioData[] = {
|
|||||||
YAML_UNSIGNED( "jackMode", 2 ),
|
YAML_UNSIGNED( "jackMode", 2 ),
|
||||||
YAML_PADDING( 1 ),
|
YAML_PADDING( 1 ),
|
||||||
YAML_STRING("ttsLanguage", 2),
|
YAML_STRING("ttsLanguage", 2),
|
||||||
|
YAML_STRING("uiLanguage", 2),
|
||||||
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
|
||||||
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
|
||||||
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
|
||||||
|
|||||||
@@ -343,6 +343,7 @@ static const struct YamlNode struct_RadioData[] = {
|
|||||||
YAML_UNSIGNED( "jackMode", 2 ),
|
YAML_UNSIGNED( "jackMode", 2 ),
|
||||||
YAML_PADDING( 1 ),
|
YAML_PADDING( 1 ),
|
||||||
YAML_STRING("ttsLanguage", 2),
|
YAML_STRING("ttsLanguage", 2),
|
||||||
|
YAML_STRING("uiLanguage", 2),
|
||||||
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
|
||||||
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
|
||||||
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
|
||||||
|
|||||||
@@ -345,6 +345,7 @@ static const struct YamlNode struct_RadioData[] = {
|
|||||||
YAML_UNSIGNED( "jackMode", 2 ),
|
YAML_UNSIGNED( "jackMode", 2 ),
|
||||||
YAML_PADDING( 1 ),
|
YAML_PADDING( 1 ),
|
||||||
YAML_STRING("ttsLanguage", 2),
|
YAML_STRING("ttsLanguage", 2),
|
||||||
|
YAML_STRING("uiLanguage", 2),
|
||||||
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
|
||||||
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
|
||||||
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
|
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
|
||||||
|
|||||||
@@ -970,6 +970,7 @@
|
|||||||
#define TR_USBMODE "USB模式"
|
#define TR_USBMODE "USB模式"
|
||||||
#define TR_JACK_MODE "教练插口模式"
|
#define TR_JACK_MODE "教练插口模式"
|
||||||
#define TR_VOICE_LANGUAGE "播报语言"
|
#define TR_VOICE_LANGUAGE "播报语言"
|
||||||
|
#define TR_TEXT_LANGUAGE "Text language"
|
||||||
#define TR_UNITS_SYSTEM "单位"
|
#define TR_UNITS_SYSTEM "单位"
|
||||||
#define TR_UNITS_PPM "PPM 单位"
|
#define TR_UNITS_PPM "PPM 单位"
|
||||||
#define TR_EDIT "编辑"
|
#define TR_EDIT "编辑"
|
||||||
|
|||||||
@@ -968,6 +968,7 @@
|
|||||||
#define TR_USBMODE "Režim USB"
|
#define TR_USBMODE "Režim USB"
|
||||||
#define TR_JACK_MODE "Režim Jack"
|
#define TR_JACK_MODE "Režim Jack"
|
||||||
#define TR_VOICE_LANGUAGE "Jazyk hlasu"
|
#define TR_VOICE_LANGUAGE "Jazyk hlasu"
|
||||||
|
#define TR_TEXT_LANGUAGE "Text language"
|
||||||
#define TR_UNITS_SYSTEM "Jednotky"
|
#define TR_UNITS_SYSTEM "Jednotky"
|
||||||
#define TR_UNITS_PPM "PPM jednotky"
|
#define TR_UNITS_PPM "PPM jednotky"
|
||||||
#define TR_EDIT "Upravit"
|
#define TR_EDIT "Upravit"
|
||||||
|
|||||||
@@ -975,6 +975,7 @@
|
|||||||
#define TR_USBMODE "USB tilstand"
|
#define TR_USBMODE "USB tilstand"
|
||||||
#define TR_JACK_MODE "Jack tilstand"
|
#define TR_JACK_MODE "Jack tilstand"
|
||||||
#define TR_VOICE_LANGUAGE "Stemme sprog"
|
#define TR_VOICE_LANGUAGE "Stemme sprog"
|
||||||
|
#define TR_TEXT_LANGUAGE "Text language"
|
||||||
#define TR_UNITS_SYSTEM "Enheder"
|
#define TR_UNITS_SYSTEM "Enheder"
|
||||||
#define TR_UNITS_PPM "PPM enheder"
|
#define TR_UNITS_PPM "PPM enheder"
|
||||||
#define TR_EDIT "Rediger"
|
#define TR_EDIT "Rediger"
|
||||||
|
|||||||
@@ -964,6 +964,7 @@
|
|||||||
#define TR_USBMODE "USB Modus"
|
#define TR_USBMODE "USB Modus"
|
||||||
#define TR_JACK_MODE "Jack Mode"
|
#define TR_JACK_MODE "Jack Mode"
|
||||||
#define TR_VOICE_LANGUAGE "Sprachansagen"
|
#define TR_VOICE_LANGUAGE "Sprachansagen"
|
||||||
|
#define TR_TEXT_LANGUAGE "Text language"
|
||||||
#define TR_UNITS_SYSTEM "Einheiten"
|
#define TR_UNITS_SYSTEM "Einheiten"
|
||||||
#define TR_UNITS_PPM "PPM Einheiten"
|
#define TR_UNITS_PPM "PPM Einheiten"
|
||||||
#define TR_EDIT "Zeile Editieren"
|
#define TR_EDIT "Zeile Editieren"
|
||||||
|
|||||||
@@ -971,6 +971,7 @@
|
|||||||
#define TR_USBMODE "USB mode"
|
#define TR_USBMODE "USB mode"
|
||||||
#define TR_JACK_MODE "Jack mode"
|
#define TR_JACK_MODE "Jack mode"
|
||||||
#define TR_VOICE_LANGUAGE "Voice language"
|
#define TR_VOICE_LANGUAGE "Voice language"
|
||||||
|
#define TR_TEXT_LANGUAGE "Text language"
|
||||||
#define TR_UNITS_SYSTEM "Units"
|
#define TR_UNITS_SYSTEM "Units"
|
||||||
#define TR_UNITS_PPM "PPM Units"
|
#define TR_UNITS_PPM "PPM Units"
|
||||||
#define TR_EDIT "Edit"
|
#define TR_EDIT "Edit"
|
||||||
|
|||||||
@@ -964,6 +964,7 @@
|
|||||||
#define TR_USBMODE "Modo USB"
|
#define TR_USBMODE "Modo USB"
|
||||||
#define TR_JACK_MODE "Modo Jack"
|
#define TR_JACK_MODE "Modo Jack"
|
||||||
#define TR_VOICE_LANGUAGE "Idioma voces"
|
#define TR_VOICE_LANGUAGE "Idioma voces"
|
||||||
|
#define TR_TEXT_LANGUAGE "Text language"
|
||||||
#define TR_UNITS_SYSTEM "Unidades"
|
#define TR_UNITS_SYSTEM "Unidades"
|
||||||
#define TR_UNITS_PPM "PPM Units"
|
#define TR_UNITS_PPM "PPM Units"
|
||||||
#define TR_EDIT "Editar"
|
#define TR_EDIT "Editar"
|
||||||
|
|||||||
@@ -964,6 +964,7 @@
|
|||||||
#define TR_USBMODE "USB-tila"
|
#define TR_USBMODE "USB-tila"
|
||||||
#define TR_JACK_MODE "Jack Mode"
|
#define TR_JACK_MODE "Jack Mode"
|
||||||
#define TR_VOICE_LANGUAGE "Äänen kieli"
|
#define TR_VOICE_LANGUAGE "Äänen kieli"
|
||||||
|
#define TR_TEXT_LANGUAGE "Text language"
|
||||||
#define TR_UNITS_SYSTEM "Units"
|
#define TR_UNITS_SYSTEM "Units"
|
||||||
#define TR_UNITS_PPM "PPM Units"
|
#define TR_UNITS_PPM "PPM Units"
|
||||||
#define TR_EDIT "Edit"
|
#define TR_EDIT "Edit"
|
||||||
|
|||||||
@@ -968,6 +968,7 @@
|
|||||||
#define TR_USBMODE "Mode USB"
|
#define TR_USBMODE "Mode USB"
|
||||||
#define TR_JACK_MODE "Mode Jack"
|
#define TR_JACK_MODE "Mode Jack"
|
||||||
#define TR_VOICE_LANGUAGE TR("Langue voix", "Langue annonces vocales")
|
#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_SYSTEM "Unités"
|
||||||
#define TR_UNITS_PPM "PPM Units"
|
#define TR_UNITS_PPM "PPM Units"
|
||||||
#define TR_EDIT "Éditer"
|
#define TR_EDIT "Éditer"
|
||||||
|
|||||||
@@ -973,6 +973,7 @@
|
|||||||
#define TR_USBMODE "USB מצב"
|
#define TR_USBMODE "USB מצב"
|
||||||
#define TR_JACK_MODE "Jack mode"
|
#define TR_JACK_MODE "Jack mode"
|
||||||
#define TR_VOICE_LANGUAGE "שפת שמע"
|
#define TR_VOICE_LANGUAGE "שפת שמע"
|
||||||
|
#define TR_TEXT_LANGUAGE "Text language"
|
||||||
#define TR_UNITS_SYSTEM "יחידות"
|
#define TR_UNITS_SYSTEM "יחידות"
|
||||||
#define TR_UNITS_PPM "PPM Units"
|
#define TR_UNITS_PPM "PPM Units"
|
||||||
#define TR_EDIT "ערוך"
|
#define TR_EDIT "ערוך"
|
||||||
|
|||||||
@@ -970,6 +970,7 @@
|
|||||||
#define TR_USBMODE "Modo USB"
|
#define TR_USBMODE "Modo USB"
|
||||||
#define TR_JACK_MODE "Modo JACK"
|
#define TR_JACK_MODE "Modo JACK"
|
||||||
#define TR_VOICE_LANGUAGE "Lingua vocale"
|
#define TR_VOICE_LANGUAGE "Lingua vocale"
|
||||||
|
#define TR_TEXT_LANGUAGE "Text language"
|
||||||
#define TR_UNITS_SYSTEM "Unità"
|
#define TR_UNITS_SYSTEM "Unità"
|
||||||
#define TR_UNITS_PPM "Unità PPM"
|
#define TR_UNITS_PPM "Unità PPM"
|
||||||
#define TR_EDIT "Modifica"
|
#define TR_EDIT "Modifica"
|
||||||
|
|||||||
@@ -969,6 +969,7 @@
|
|||||||
#define TR_USBMODE "USBモード"
|
#define TR_USBMODE "USBモード"
|
||||||
#define TR_JACK_MODE "Jackモード"
|
#define TR_JACK_MODE "Jackモード"
|
||||||
#define TR_VOICE_LANGUAGE "音声言語"
|
#define TR_VOICE_LANGUAGE "音声言語"
|
||||||
|
#define TR_TEXT_LANGUAGE "Text language"
|
||||||
#define TR_UNITS_SYSTEM "ユニット"
|
#define TR_UNITS_SYSTEM "ユニット"
|
||||||
#define TR_UNITS_PPM "PPMユニット"
|
#define TR_UNITS_PPM "PPMユニット"
|
||||||
#define TR_EDIT "編集"
|
#define TR_EDIT "編集"
|
||||||
|
|||||||
@@ -1014,6 +1014,7 @@
|
|||||||
#define TR_USBMODE "USB 모드"
|
#define TR_USBMODE "USB 모드"
|
||||||
#define TR_JACK_MODE "잭 모드"
|
#define TR_JACK_MODE "잭 모드"
|
||||||
#define TR_VOICE_LANGUAGE "음성 언어"
|
#define TR_VOICE_LANGUAGE "음성 언어"
|
||||||
|
#define TR_TEXT_LANGUAGE "Text language"
|
||||||
#define TR_UNITS_SYSTEM "단위 체계"
|
#define TR_UNITS_SYSTEM "단위 체계"
|
||||||
#define TR_UNITS_PPM "PPM 단위"
|
#define TR_UNITS_PPM "PPM 단위"
|
||||||
#define TR_EDIT "편집"
|
#define TR_EDIT "편집"
|
||||||
|
|||||||
@@ -966,6 +966,7 @@
|
|||||||
#define TR_USBMODE "USB Mode"
|
#define TR_USBMODE "USB Mode"
|
||||||
#define TR_JACK_MODE "Jack Mode"
|
#define TR_JACK_MODE "Jack Mode"
|
||||||
#define TR_VOICE_LANGUAGE "Taal"
|
#define TR_VOICE_LANGUAGE "Taal"
|
||||||
|
#define TR_TEXT_LANGUAGE "Text language"
|
||||||
#define TR_UNITS_SYSTEM "Eenheden"
|
#define TR_UNITS_SYSTEM "Eenheden"
|
||||||
#define TR_UNITS_PPM "PPM Units"
|
#define TR_UNITS_PPM "PPM Units"
|
||||||
#define TR_EDIT "Wijzigen"
|
#define TR_EDIT "Wijzigen"
|
||||||
|
|||||||
@@ -963,6 +963,7 @@
|
|||||||
#define TR_USBMODE "Tryb USB"
|
#define TR_USBMODE "Tryb USB"
|
||||||
#define TR_JACK_MODE "Tryb Jack"
|
#define TR_JACK_MODE "Tryb Jack"
|
||||||
#define TR_VOICE_LANGUAGE "Język głosu"
|
#define TR_VOICE_LANGUAGE "Język głosu"
|
||||||
|
#define TR_TEXT_LANGUAGE "Text language"
|
||||||
#define TR_UNITS_SYSTEM "Jednostki"
|
#define TR_UNITS_SYSTEM "Jednostki"
|
||||||
#define TR_UNITS_PPM "Jednostki PPM"
|
#define TR_UNITS_PPM "Jednostki PPM"
|
||||||
#define TR_EDIT "Edytuj"
|
#define TR_EDIT "Edytuj"
|
||||||
|
|||||||
@@ -971,6 +971,7 @@
|
|||||||
#define TR_USBMODE "Modo USB"
|
#define TR_USBMODE "Modo USB"
|
||||||
#define TR_JACK_MODE "Jack mode"
|
#define TR_JACK_MODE "Jack mode"
|
||||||
#define TR_VOICE_LANGUAGE "Idoma da Voz"
|
#define TR_VOICE_LANGUAGE "Idoma da Voz"
|
||||||
|
#define TR_TEXT_LANGUAGE "Text language"
|
||||||
#define TR_UNITS_SYSTEM "Unidades"
|
#define TR_UNITS_SYSTEM "Unidades"
|
||||||
#define TR_UNITS_PPM "Unidade PPM"
|
#define TR_UNITS_PPM "Unidade PPM"
|
||||||
#define TR_EDIT "Editar"
|
#define TR_EDIT "Editar"
|
||||||
|
|||||||
@@ -972,6 +972,7 @@
|
|||||||
#define TR_USBMODE "Режим USB"
|
#define TR_USBMODE "Режим USB"
|
||||||
#define TR_JACK_MODE "Режим разъема"
|
#define TR_JACK_MODE "Режим разъема"
|
||||||
#define TR_VOICE_LANGUAGE "Язык озвучки"
|
#define TR_VOICE_LANGUAGE "Язык озвучки"
|
||||||
|
#define TR_TEXT_LANGUAGE "Text language"
|
||||||
#define TR_UNITS_SYSTEM "Единицы"
|
#define TR_UNITS_SYSTEM "Единицы"
|
||||||
#define TR_UNITS_PPM "PPM Един"
|
#define TR_UNITS_PPM "PPM Един"
|
||||||
#define TR_EDIT "Редактировать"
|
#define TR_EDIT "Редактировать"
|
||||||
|
|||||||
@@ -971,6 +971,7 @@
|
|||||||
#define TR_USBMODE "USB-läge"
|
#define TR_USBMODE "USB-läge"
|
||||||
#define TR_JACK_MODE "Uttagsläge"
|
#define TR_JACK_MODE "Uttagsläge"
|
||||||
#define TR_VOICE_LANGUAGE "Röstspråk"
|
#define TR_VOICE_LANGUAGE "Röstspråk"
|
||||||
|
#define TR_TEXT_LANGUAGE "Text language"
|
||||||
#define TR_UNITS_SYSTEM "Enheter"
|
#define TR_UNITS_SYSTEM "Enheter"
|
||||||
#define TR_UNITS_PPM "PPM-enheter"
|
#define TR_UNITS_PPM "PPM-enheter"
|
||||||
#define TR_EDIT "Redigera"
|
#define TR_EDIT "Redigera"
|
||||||
|
|||||||
@@ -967,6 +967,7 @@
|
|||||||
#define TR_USBMODE "USB模式"
|
#define TR_USBMODE "USB模式"
|
||||||
#define TR_JACK_MODE "教練插口模式"
|
#define TR_JACK_MODE "教練插口模式"
|
||||||
#define TR_VOICE_LANGUAGE "播報語言"
|
#define TR_VOICE_LANGUAGE "播報語言"
|
||||||
|
#define TR_TEXT_LANGUAGE "Text language"
|
||||||
#define TR_UNITS_SYSTEM "單位"
|
#define TR_UNITS_SYSTEM "單位"
|
||||||
#define TR_UNITS_PPM "PPM 單位"
|
#define TR_UNITS_PPM "PPM 單位"
|
||||||
#define TR_EDIT "編輯"
|
#define TR_EDIT "編輯"
|
||||||
|
|||||||
@@ -971,6 +971,7 @@
|
|||||||
#define TR_USBMODE "Режим USB"
|
#define TR_USBMODE "Режим USB"
|
||||||
#define TR_JACK_MODE "Режим коннектора"
|
#define TR_JACK_MODE "Режим коннектора"
|
||||||
#define TR_VOICE_LANGUAGE "Мова голосу"
|
#define TR_VOICE_LANGUAGE "Мова голосу"
|
||||||
|
#define TR_TEXT_LANGUAGE "Text language"
|
||||||
#define TR_UNITS_SYSTEM "Одиниці"
|
#define TR_UNITS_SYSTEM "Одиниці"
|
||||||
#define TR_UNITS_PPM "PPM одиниці"
|
#define TR_UNITS_PPM "PPM одиниці"
|
||||||
#define TR_EDIT "Редагувати"
|
#define TR_EDIT "Редагувати"
|
||||||
|
|||||||
@@ -978,6 +978,7 @@
|
|||||||
#define STR_TEST_NOTSAFE currentLangStrings->STR_TEST_NOTSAFE
|
#define STR_TEST_NOTSAFE currentLangStrings->STR_TEST_NOTSAFE
|
||||||
#define STR_TEST_WARNING currentLangStrings->STR_TEST_WARNING
|
#define STR_TEST_WARNING currentLangStrings->STR_TEST_WARNING
|
||||||
#define STR_TEXT_COLOR currentLangStrings->STR_TEXT_COLOR
|
#define STR_TEXT_COLOR currentLangStrings->STR_TEXT_COLOR
|
||||||
|
#define STR_TEXT_LANGUAGE currentLangStrings->STR_TEXT_LANGUAGE
|
||||||
#define STR_THEME currentLangStrings->STR_THEME
|
#define STR_THEME currentLangStrings->STR_THEME
|
||||||
#define STR_THROTTLE_LABEL currentLangStrings->STR_THROTTLE_LABEL
|
#define STR_THROTTLE_LABEL currentLangStrings->STR_THROTTLE_LABEL
|
||||||
#define STR_THROTTLE_NOT_IDLE currentLangStrings->STR_THROTTLE_NOT_IDLE
|
#define STR_THROTTLE_NOT_IDLE currentLangStrings->STR_THROTTLE_NOT_IDLE
|
||||||
|
|||||||
@@ -977,6 +977,7 @@ STR(TEMP_CALIB)
|
|||||||
STR(TEST_NOTSAFE)
|
STR(TEST_NOTSAFE)
|
||||||
STR(TEST_WARNING)
|
STR(TEST_WARNING)
|
||||||
STR(TEXT_COLOR)
|
STR(TEXT_COLOR)
|
||||||
|
STR(TEXT_LANGUAGE)
|
||||||
STR(THEME)
|
STR(THEME)
|
||||||
STR(THROTTLE_LABEL)
|
STR(THROTTLE_LABEL)
|
||||||
STR(THROTTLE_NOT_IDLE)
|
STR(THROTTLE_NOT_IDLE)
|
||||||
|
|||||||
@@ -62,6 +62,16 @@
|
|||||||
#include "translations/i18n/en.h"
|
#include "translations/i18n/en.h"
|
||||||
#endif
|
#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_HOUR = TR_CHR_HOUR;
|
||||||
const char CHR_INPUT = TR_CHR_INPUT;
|
const char CHR_INPUT = TR_CHR_INPUT;
|
||||||
|
|
||||||
@@ -80,6 +90,19 @@ const char CHR_INPUT = TR_CHR_INPUT;
|
|||||||
|
|
||||||
#else
|
#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[]
|
// Order must match languagePack[]
|
||||||
#if defined(COLORLCD)
|
#if defined(COLORLCD)
|
||||||
const LangStrings* const langStrings[] = {
|
const LangStrings* const langStrings[] = {
|
||||||
|
|||||||
@@ -41,6 +41,8 @@
|
|||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
|
bool isTextLangAvail(int lang);
|
||||||
|
|
||||||
// Static string
|
// Static string
|
||||||
#define STR(x) extern const char STR_##x[];
|
#define STR(x) extern const char STR_##x[];
|
||||||
// Static string array
|
// Static string array
|
||||||
|
|||||||
@@ -45,6 +45,7 @@ struct LanguagePack {
|
|||||||
|
|
||||||
extern const LanguagePack * currentLanguagePack;
|
extern const LanguagePack * currentLanguagePack;
|
||||||
extern uint8_t currentLanguagePackIdx;
|
extern uint8_t currentLanguagePackIdx;
|
||||||
|
extern uint8_t getLanguageId(const char* lang);
|
||||||
|
|
||||||
enum RadioLanguage {
|
enum RadioLanguage {
|
||||||
LANG_CN,
|
LANG_CN,
|
||||||
|
|||||||
Reference in New Issue
Block a user