chore: improve translation string management (#6502)
This commit is contained in:
@@ -87,7 +87,7 @@ void menuModelCurveOne(event_t event)
|
||||
CurveHeader & crv = g_model.curves[s_currIdxSubMenu];
|
||||
int8_t * points = curveAddress(s_currIdxSubMenu);
|
||||
|
||||
drawStringWithIndex(PSIZE(TR_MENUCURVES)*FW+FW, 0, STR_CV, s_currIdxSubMenu+1);
|
||||
drawStringWithIndex(strlen(STR_MENUCURVES)*FW+FW, 0, STR_CV, s_currIdxSubMenu+1);
|
||||
|
||||
uint8_t old_editMode = s_editMode;
|
||||
|
||||
|
||||
@@ -59,7 +59,7 @@ void menuModelCustomScriptOne(event_t event)
|
||||
{
|
||||
ScriptData & sd = g_model.scriptsData[s_currIdx];
|
||||
|
||||
drawStringWithIndex(PSIZE(TR_MENUCUSTOMSCRIPTS)*FW+FW, 0, "LUA", s_currIdx+1, 0);
|
||||
drawStringWithIndex(strlen(STR_MENUCUSTOMSCRIPTS)*FW+FW, 0, "LUA", s_currIdx+1, 0);
|
||||
lcdDrawFilledRect(0, 0, LCD_W, FH, SOLID, 0);
|
||||
|
||||
uint8_t old_editMode = s_editMode;
|
||||
@@ -90,7 +90,7 @@ void menuModelCustomScriptOne(event_t event)
|
||||
}
|
||||
}
|
||||
else if (i == ITEM_MODEL_CUSTOMSCRIPT_NAME) {
|
||||
lcdDrawTextAlignedLeft(y, TR_NAME);
|
||||
lcdDrawTextAlignedLeft(y, STR_NAME);
|
||||
editName(SCRIPT_ONE_2ND_COLUMN_POS, y, sd.name, sizeof(sd.name), event,
|
||||
(attr != 0), attr, old_editMode);
|
||||
} else if (i == ITEM_MODEL_CUSTOMSCRIPT_PARAMS_LABEL) {
|
||||
|
||||
@@ -151,7 +151,7 @@ void menuModelFlightModeOne(event_t event)
|
||||
|
||||
#if defined(GVARS)
|
||||
case ITEM_MODEL_FLIGHT_MODE_GVARS_LABEL:
|
||||
lcdDrawTextAlignedLeft(y, TR_MENU_GLOBAL_VARS);
|
||||
lcdDrawTextAlignedLeft(y, STR_MENU_GLOBAL_VARS);
|
||||
break;
|
||||
|
||||
default:
|
||||
|
||||
@@ -70,7 +70,7 @@ void menuModelGVarOne(event_t event)
|
||||
{
|
||||
GVarData * gvar = &g_model.gvars[s_currIdxSubMenu];
|
||||
|
||||
drawStringWithIndex(PSIZE(TR_GVARS)*FW+FW, 0, STR_GV, s_currIdxSubMenu+1, 0);
|
||||
drawStringWithIndex(strlen(STR_GVARS)*FW+FW, 0, STR_GV, s_currIdxSubMenu+1, 0);
|
||||
drawGVarValue(32*FW, 0, s_currIdxSubMenu, getGVarValue(s_currIdxSubMenu, getFlightMode()));
|
||||
lcdDrawFilledRect(0, 0, LCD_W, FH, SOLID);
|
||||
|
||||
|
||||
@@ -62,7 +62,7 @@ void menuModelExpoOne(event_t event)
|
||||
}
|
||||
|
||||
ExpoData * ed = expoAddress(s_currIdx);
|
||||
drawSource(PSIZE(TR_MENUINPUTS)*FW+FW, 0, MIXSRC_FIRST_INPUT+ed->chn, 0);
|
||||
drawSource(strlen(STR_MENUINPUTS)*FW+FW, 0, MIXSRC_FIRST_INPUT+ed->chn, 0);
|
||||
|
||||
uint8_t old_editMode = s_editMode;
|
||||
|
||||
|
||||
@@ -98,7 +98,7 @@ void menuModelMixOne(event_t event)
|
||||
}
|
||||
|
||||
MixData * md2 = mixAddress(s_currIdx) ;
|
||||
putsChn(PSIZE(TR_MIXES)*FW+FW, 0, md2->destCh+1,0);
|
||||
putsChn(strlen(STR_MIXES)*FW+FW, 0, md2->destCh+1,0);
|
||||
|
||||
uint8_t old_editMode = s_editMode;
|
||||
|
||||
|
||||
@@ -133,7 +133,7 @@ void menuModelLimitsOne(event_t event)
|
||||
break;
|
||||
|
||||
case ITEM_OUTPUTONE_OFFSET:
|
||||
ld->offset = gvValEdit(TR_LIMITS_HEADERS_SUBTRIM, ld->offset, 0, -1000, 1000, y, attr, event, active, 0);
|
||||
ld->offset = gvValEdit(STR_LIMITS_HEADERS_SUBTRIM, ld->offset, 0, -1000, 1000, y, attr, event, active, 0);
|
||||
break;
|
||||
|
||||
case ITEM_OUTPUTONE_MIN:
|
||||
@@ -164,7 +164,7 @@ void menuModelLimitsOne(event_t event)
|
||||
|
||||
#if defined(PPM_CENTER_ADJUSTABLE)
|
||||
case ITEM_OUTPUTONE_PPM_CENTER:
|
||||
lcdDrawTextAlignedLeft(y, TR_LIMITS_HEADERS_PPMCENTER);
|
||||
lcdDrawTextAlignedLeft(y, STR_LIMITS_HEADERS_PPMCENTER);
|
||||
lcdDrawNumber(LIMITS_ONE_2ND_COLUMN, y, PPM_CENTER+ld->ppmCenter, attr);
|
||||
if (active) {
|
||||
CHECK_INCDEC_MODELVAR(event, ld->ppmCenter, -PPM_CENTER_MAX, +PPM_CENTER_MAX);
|
||||
@@ -174,7 +174,7 @@ void menuModelLimitsOne(event_t event)
|
||||
|
||||
#if defined(PPM_LIMITS_SYMETRICAL)
|
||||
case ITEM_OUTPUTONE_SYMETRICAL:
|
||||
lcdDrawTextAlignedLeft(y, TR_LIMITS_HEADERS_SUBTRIMMODE);
|
||||
lcdDrawTextAlignedLeft(y, STR_LIMITS_HEADERS_SUBTRIMMODE);
|
||||
lcdDrawSizedText(LIMITS_ONE_2ND_COLUMN, y,
|
||||
ld->symetrical ? "=" : STR_CHAR_DELTA, 2, attr);
|
||||
if (active) {
|
||||
|
||||
@@ -1556,18 +1556,18 @@ void menuModelSetup(event_t event)
|
||||
MODULE_SUBTYPE_R9M_EU) {
|
||||
POPUP_WARNING(STR_MODULE_PROTOCOL_FLEX_WARN_LINE1);
|
||||
SET_WARNING_INFO(STR_MODULE_PROTOCOL_WARN_LINE2,
|
||||
sizeof(TR_MODULE_PROTOCOL_WARN_LINE2) - 1, 0);
|
||||
strlen(STR_MODULE_PROTOCOL_WARN_LINE2), 0);
|
||||
}
|
||||
#if POPUP_LEVEL >= 3
|
||||
else if (g_model.moduleData[moduleIdx].subType ==
|
||||
MODULE_SUBTYPE_R9M_EU) {
|
||||
POPUP_WARNING(STR_MODULE_PROTOCOL_EU_WARN_LINE1);
|
||||
SET_WARNING_INFO(STR_MODULE_PROTOCOL_WARN_LINE2,
|
||||
sizeof(TR_MODULE_PROTOCOL_WARN_LINE2) - 1, 0);
|
||||
strlen(STR_MODULE_PROTOCOL_WARN_LINE2), 0);
|
||||
} else {
|
||||
POPUP_WARNING(STR_MODULE_PROTOCOL_FCC_WARN_LINE1);
|
||||
SET_WARNING_INFO(STR_MODULE_PROTOCOL_WARN_LINE2,
|
||||
sizeof(TR_MODULE_PROTOCOL_WARN_LINE2) - 1, 0);
|
||||
strlen(STR_MODULE_PROTOCOL_WARN_LINE2), 0);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
@@ -1754,7 +1754,7 @@ void menuModelSetup(event_t event)
|
||||
}
|
||||
if (bluetooth.distantAddr[0]) {
|
||||
lcdDrawText(INDENT_WIDTH, y+1, bluetooth.distantAddr, TINSIZE);
|
||||
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, BUTTON(TR_CLEAR), attr);
|
||||
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_CLEAR, attr);
|
||||
if (attr && event == EVT_KEY_BREAK(KEY_ENTER)) {
|
||||
bluetooth.state = BLUETOOTH_STATE_CLEAR_REQUESTED;
|
||||
memclear(bluetooth.distantAddr, sizeof(bluetooth.distantAddr));
|
||||
@@ -1765,7 +1765,7 @@ void menuModelSetup(event_t event)
|
||||
if (bluetooth.state < BLUETOOTH_STATE_IDLE)
|
||||
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_BUTTON_INIT, attr);
|
||||
else
|
||||
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, BUTTON(TR_DISCOVER), attr);
|
||||
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_DISCOVER, attr);
|
||||
if (attr && event == EVT_KEY_BREAK(KEY_ENTER)) {
|
||||
if (bluetooth.state < BLUETOOTH_STATE_IDLE) {
|
||||
bluetooth.state = BLUETOOTH_STATE_OFF;
|
||||
@@ -1914,7 +1914,7 @@ void menuModelSetup(event_t event)
|
||||
#endif
|
||||
{
|
||||
lcdDrawTextIndented(y, STR_MODULE);
|
||||
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, BUTTON(TR_REGISTER), (menuHorizontalPosition == 0 ? attr : 0));
|
||||
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_REGISTER, (menuHorizontalPosition == 0 ? attr : 0));
|
||||
lcdDrawText(lcdLastRightPos + 3, y, STR_MODULE_RANGE, (menuHorizontalPosition == 1 ? attr : 0));
|
||||
if (attr) {
|
||||
if (moduleState[moduleIdx].mode == MODULE_MODE_NORMAL && s_editMode > 0) {
|
||||
@@ -2186,7 +2186,7 @@ void menuModelSetup(event_t event)
|
||||
if (event && !s_editMode && reusableBuffer.moduleSetup.antennaMode != g_model.moduleData[INTERNAL_MODULE].pxx.antennaMode) {
|
||||
if (reusableBuffer.moduleSetup.antennaMode == ANTENNA_MODE_EXTERNAL && !isExternalAntennaEnabled()) {
|
||||
POPUP_CONFIRMATION(STR_ANTENNACONFIRM1, onModelAntennaSwitchConfirm);
|
||||
SET_WARNING_INFO(STR_ANTENNACONFIRM2, sizeof(TR_ANTENNACONFIRM2), 0);
|
||||
SET_WARNING_INFO(STR_ANTENNACONFIRM2, strlen(STR_ANTENNACONFIRM2), 0);
|
||||
}
|
||||
else {
|
||||
g_model.moduleData[INTERNAL_MODULE].pxx.antennaMode = reusableBuffer.moduleSetup.antennaMode;
|
||||
@@ -2518,7 +2518,7 @@ void menuModelSetup(event_t event)
|
||||
expandState.viewOpt = expandableSection(y, STR_ENABLED_FEATURES, expandState.viewOpt, attr, event);
|
||||
break;
|
||||
case ITEM_VIEW_OPTIONS_RADIO_TAB:
|
||||
lcdDrawText(INDENT_WIDTH-2, y, TR_RADIO_MENU_TABS);
|
||||
lcdDrawText(INDENT_WIDTH-2, y, STR_RADIO_MENU_TABS);
|
||||
break;
|
||||
case ITEM_VIEW_OPTIONS_GF:
|
||||
g_model.radioGFDisabled = viewOptChoice(y, STR_MENUSPECIALFUNCS, g_model.radioGFDisabled, attr, event);
|
||||
@@ -2527,7 +2527,7 @@ void menuModelSetup(event_t event)
|
||||
g_model.radioTrainerDisabled = viewOptChoice(y, STR_MENUTRAINER, g_model.radioTrainerDisabled, attr, event);
|
||||
break;
|
||||
case ITEM_VIEW_OPTIONS_MODEL_TAB:
|
||||
lcdDrawText(INDENT_WIDTH-2, y, TR_MODEL_MENU_TABS);
|
||||
lcdDrawText(INDENT_WIDTH-2, y, STR_MODEL_MENU_TABS);
|
||||
break;
|
||||
#if defined(HELI)
|
||||
case ITEM_VIEW_OPTIONS_HELI:
|
||||
@@ -2575,14 +2575,14 @@ void menuModelSetup(event_t event)
|
||||
break;
|
||||
|
||||
case ITEM_MODEL_SETUP_USBJOYSTICK_CH_BUTTON:
|
||||
lcdDrawText(INDENT_WIDTH, y, BUTTON(TR_USBJOYSTICK_SETTINGS), attr);
|
||||
lcdDrawText(INDENT_WIDTH, y, STR_USBJOYSTICK_SETTINGS, attr);
|
||||
if (attr && event == EVT_KEY_BREAK(KEY_ENTER)) {
|
||||
pushMenu(menuModelUSBJoystick);
|
||||
}
|
||||
break;
|
||||
|
||||
case ITEM_MODEL_SETUP_USBJOYSTICK_APPLY:
|
||||
lcdDrawText(INDENT_WIDTH, y, BUTTON(TR_USBJOYSTICK_APPLY_CHANGES), attr);
|
||||
lcdDrawText(INDENT_WIDTH, y, STR_USBJOYSTICK_APPLY_CHANGES, attr);
|
||||
if (attr && event == EVT_KEY_BREAK(KEY_ENTER)) {
|
||||
onUSBJoystickModelChanged();
|
||||
}
|
||||
|
||||
@@ -68,7 +68,7 @@ void menuModelSensor(event_t event)
|
||||
0 // Logs
|
||||
});
|
||||
|
||||
lcdDrawNumber(PSIZE(TR_MENUSENSOR)*FW+1, 0, s_currIdx+1, INVERS|LEFT);
|
||||
lcdDrawNumber(strlen(STR_MENUSENSOR)*FW+1, 0, s_currIdx+1, INVERS|LEFT);
|
||||
|
||||
if (!isGPSSensor(s_currIdx+1))
|
||||
drawSensorCustomValue(SENSOR_2ND_COLUMN, 0, s_currIdx, getValue(MIXSRC_FIRST_TELEM+3*s_currIdx), LEFT);
|
||||
|
||||
@@ -795,7 +795,7 @@ void menuRadioSetup(event_t event)
|
||||
expandState.viewOpt = expandableSection(y, STR_ENABLED_FEATURES, expandState.viewOpt, attr, event);
|
||||
break;
|
||||
case ITEM_VIEW_OPTIONS_RADIO_TAB:
|
||||
lcdDrawText(INDENT_WIDTH-2, y, TR_RADIO_MENU_TABS);
|
||||
lcdDrawText(INDENT_WIDTH-2, y, STR_RADIO_MENU_TABS);
|
||||
break;
|
||||
case ITEM_VIEW_OPTIONS_GF:
|
||||
g_eeGeneral.radioGFDisabled = viewOptCheckBox(y, STR_MENUSPECIALFUNCS, g_eeGeneral.radioGFDisabled, attr, event, g_model.radioGFDisabled);
|
||||
@@ -804,7 +804,7 @@ void menuRadioSetup(event_t event)
|
||||
g_eeGeneral.radioTrainerDisabled = viewOptCheckBox(y, STR_MENUTRAINER, g_eeGeneral.radioTrainerDisabled, attr, event, g_model.radioTrainerDisabled);
|
||||
break;
|
||||
case ITEM_VIEW_OPTIONS_MODEL_TAB:
|
||||
lcdDrawText(INDENT_WIDTH-2, y, TR_MODEL_MENU_TABS);
|
||||
lcdDrawText(INDENT_WIDTH-2, y, STR_MODEL_MENU_TABS);
|
||||
break;
|
||||
#if defined(HELI)
|
||||
case ITEM_VIEW_OPTIONS_HELI:
|
||||
|
||||
@@ -154,7 +154,7 @@ void menuStatisticsDebug(event_t event)
|
||||
y += FH;
|
||||
|
||||
#if defined(LUA)
|
||||
lcdDrawTextAlignedLeft(y, TR_LUA_SCRIPTS_LABEL);
|
||||
lcdDrawTextAlignedLeft(y, STR_LUA_SCRIPTS_LABEL);
|
||||
lcdDrawText(MENU_DEBUG_COL1_OFS, y+1, STR_DURATION_MS, SMLSIZE);
|
||||
lcdDrawNumber(lcdLastRightPos, y, 10*maxLuaDuration, LEFT);
|
||||
lcdDrawText(lcdLastRightPos+2, y+1, STR_INTERVAL_MS, SMLSIZE);
|
||||
|
||||
Reference in New Issue
Block a user