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

chore: improve translation string management (#6502)

Browse Source
This commit is contained in:
philmoz
2025-10-05 13:04:17 +10:00
committed by GitHub
parent 92b0637b01
commit 6a37b3d4bc
129 changed files with 9883 additions and 6544 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/common/stdlcd/boot_menu.cpp
-2
View File
@@ -24,8 +24,6 @@
#include "board.h"
#include "lcd.h"
#include "translations.h"
#include "fw_version.h"
#include "translations/bl_translations.h"
#include "bootloader/boot.h"
radio/src/gui/common/stdlcd/model_inputs.cpp
+2 -2
View File
@@ -364,8 +364,8 @@ void menuModelExposAll(event_t event)
s_copyTgtOfs = next_ofs;
}
lcdDrawNumber(FW*sizeof(TR_MENUINPUTS)+FW+FW/2, 0, getExposCount(), RIGHT);
lcdDrawText(FW*sizeof(TR_MENUINPUTS)+FW+FW/2, 0, STR_MAX(MAX_EXPOS));
lcdDrawNumber(FW*strlen(STR_MENUINPUTS)+FW+FW/2, 0, getExposCount(), RIGHT);
lcdDrawText(FW*strlen(STR_MENUINPUTS)+FW+FW/2, 0, STR_MAX(MAX_EXPOS));
#if LCD_DEPTH > 1
// Value
radio/src/gui/common/stdlcd/model_mixes.cpp
+3 -3
View File
@@ -141,8 +141,8 @@ void displayMixInfos(coord_t y, MixData * md)
void displayMixLine(coord_t y, MixData * md, bool active)
{
if(active && md->name[0]) {
lcdDrawFilledRect(FW*sizeof(TR_MIXES)+FW/2, 0, FW*4+1, MENU_HEADER_HEIGHT, 0xFF, ERASE);
lcdDrawSizedText(FW*sizeof(TR_MIXES)+FW/2, 0, md->name, sizeof(md->name), 0);
lcdDrawFilledRect(FW*strlen(STR_MIXES)+FW/2, 0, FW*4+1, MENU_HEADER_HEIGHT, 0xFF, ERASE);
lcdDrawSizedText(FW*strlen(STR_MIXES)+FW/2, 0, md->name, sizeof(md->name), 0);
if (!md->flightModes || ((md->curve.value || md->swtch) && ((get_tmr10ms() / 200) & 1)))
displayMixInfos(y, md);
else
@@ -279,7 +279,7 @@ void menuModelMixAll(event_t event)
s_copyTgtOfs = next_ofs;
}
lcdDrawNumber(FW*sizeof(TR_MIXES)+FW/2, 0, getMixCount(), 0);
lcdDrawNumber(FW*strlen(STR_MIXES)+FW/2, 0, getMixCount(), 0);
lcdDrawText(lcdNextPos, 0, STR_MAX(MAX_MIXERS));
// Value
radio/src/gui/common/stdlcd/model_setup_pxx2.cpp
+3 -3
View File
@@ -215,7 +215,7 @@ void runPopupRegister(event_t event)
// RX name
if (reusableBuffer.moduleSetup.pxx2.registerStep < REGISTER_RX_NAME_RECEIVED) {
lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y - 4 + 2 * FH, STR_WAITING);
lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y - 2 + 3 * FH, TR_EXIT, menuVerticalPosition == ITEM_REGISTER_BUTTONS ? INVERS : 0);
lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y - 2 + 3 * FH, STR_EXIT, menuVerticalPosition == ITEM_REGISTER_BUTTONS ? INVERS : 0);
}
else {
lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y - 4 + 2 * FH, STR_RX_NAME);
@@ -225,13 +225,13 @@ void runPopupRegister(event_t event)
event, menuVerticalPosition == ITEM_REGISTER_RECEIVER_NAME, 0,
backupEditMode);
lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y - 2 + 3 * FH, TR_ENTER,
lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y - 2 + 3 * FH, STR_ENTER,
menuVerticalPosition == ITEM_REGISTER_BUTTONS &&
menuHorizontalPosition == 0
? INVERS
: 0);
lcdDrawText(WARNING_LINE_X + 8 * FW, WARNING_LINE_Y - 2 + 3 * FH, TR_EXIT,
lcdDrawText(WARNING_LINE_X + 8 * FW, WARNING_LINE_Y - 2 + 3 * FH, STR_EXIT,
menuVerticalPosition == ITEM_REGISTER_BUTTONS &&
menuHorizontalPosition == 1
? INVERS
radio/src/gui/common/stdlcd/model_usbjoystick.cpp
+2 -2
View File
@@ -87,7 +87,7 @@ void menuModelUSBJoystickOne(event_t event)
break;
case USBJ_FIELD_INVERSION:
lcdDrawTextAlignedLeft(y, TR_USBJOYSTICK_CH_INVERSION);
lcdDrawTextAlignedLeft(y, STR_USBJOYSTICK_CH_INVERSION);
drawCheckBox(USBJ_ONE_2ND_COLUMN, y, cch->inversion, attr);
if (attr) cch->inversion = checkIncDecModel(event, cch->inversion, 0, 1);
break;
@@ -123,7 +123,7 @@ void menuModelUSBJoystickOne(event_t event)
break;
case USBJ_FIELD_BTNNUM:
lcdDrawTextAlignedLeft(y, TR_USBJOYSTICK_CH_BTNNUM);
lcdDrawTextAlignedLeft(y, STR_USBJOYSTICK_CH_BTNNUM);
uint8_t last = cch->lastBtnNumNoCLip();
uint8_t limited = 0;
if(last >= USBJ_BUTTON_SIZE) {
radio/src/gui/common/stdlcd/popups.cpp
+1 -1
View File
@@ -174,7 +174,7 @@ void runPopupWarning(event_t event)
break;
case WARNING_TYPE_ASTERISK:
lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y+4*FH+2, BUTTON(TR_EXIT));
lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y+4*FH+2, STR_EXIT_BTN);
break;
default:
radio/src/gui/common/stdlcd/radio_hardware.cpp
+2 -2
View File
@@ -410,7 +410,7 @@ void menuRadioHardware(event_t event)
switch(k) {
case ITEM_RADIO_HARDWARE_LABEL_STICKS:
lcdDrawTextAlignedLeft(y, STR_STICKS);
lcdDrawText(HW_SETTINGS_COLUMN2, y, BUTTON(TR_CALIBRATION), attr);
lcdDrawText(HW_SETTINGS_COLUMN2, y, STR_CALIBRATION, attr);
if (attr && event == EVT_KEY_BREAK(KEY_ENTER)) {
pushMenu(menuRadioCalibration);
}
@@ -548,7 +548,7 @@ void menuRadioHardware(event_t event)
if (!s_editMode && reusableBuffer.radioHardware.antennaMode != g_eeGeneral.antennaMode) {
if (!isExternalAntennaEnabled() && (reusableBuffer.radioHardware.antennaMode == ANTENNA_MODE_EXTERNAL || (reusableBuffer.radioHardware.antennaMode == ANTENNA_MODE_PER_MODEL && g_model.moduleData[INTERNAL_MODULE].pxx.antennaMode == ANTENNA_MODE_EXTERNAL))) {
POPUP_CONFIRMATION(STR_ANTENNACONFIRM1, onHardwareAntennaSwitchConfirm);
SET_WARNING_INFO(STR_ANTENNACONFIRM2, sizeof(TR_ANTENNACONFIRM2), 0);
SET_WARNING_INFO(STR_ANTENNACONFIRM2, strlen(STR_ANTENNACONFIRM2), 0);
}
else {
g_eeGeneral.antennaMode = reusableBuffer.radioHardware.antennaMode;
radio/src/gui/common/stdlcd/radio_sdmanager.cpp
+2 -2
View File
@@ -90,7 +90,7 @@ void onUpdateStateChanged()
uint8_t modelId = reusableBuffer.sdManager.otaUpdateInformation.receiverInformation.modelID;
if (isPXX2ReceiverOptionAvailable(modelId, RECEIVER_OPTION_OTA_TO_UPDATE_SELF)) {
POPUP_CONFIRMATION(getPXX2ReceiverName(modelId), onUpdateConfirmation);
char *tmp = strAppend(reusableBuffer.sdManager.otaReceiverVersion, TR_CURRENT_VERSION);
char *tmp = strAppend(reusableBuffer.sdManager.otaReceiverVersion, STR_CURRENT_VERSION);
tmp = strAppendUnsigned(tmp, 1 + reusableBuffer.sdManager.otaUpdateInformation.receiverInformation.swVersion.major);
*tmp++ = '.';
tmp = strAppendUnsigned(tmp, reusableBuffer.sdManager.otaUpdateInformation.receiverInformation.swVersion.minor);
@@ -100,7 +100,7 @@ void onUpdateStateChanged()
}
else {
POPUP_WARNING(STR_OTA_UPDATE_ERROR);
SET_WARNING_INFO(STR_UNSUPPORTED_RX, sizeof(TR_UNSUPPORTED_RX) - 1, 0);
SET_WARNING_INFO(STR_UNSUPPORTED_RX, strlen(STR_UNSUPPORTED_RX) - 1, 0);
moduleState[reusableBuffer.sdManager.otaUpdateInformation.module].mode = MODULE_MODE_NORMAL;
}
}
radio/src/gui/common/stdlcd/radio_trainer.cpp
+1 -1
View File
@@ -100,7 +100,7 @@ void menuRadioTrainer(event_t event)
attr = (menuVerticalPosition==HEADER_LINE+4) ? blink : 0;
if (g_model.trainerData.mode == TRAINER_MODE_MASTER_TRAINER_JACK) {
lcdDrawTextAlignedLeft(y, STR_MULTIPLIER);
lcdDrawNumber(LEN_MULTIPLIER * FW + 3 * FW, y, g_eeGeneral.PPM_Multiplier + 10, attr | PREC1 | RIGHT);
lcdDrawNumber(strlen(STR_MULTIPLIER) * FW + 3 * FW, y, g_eeGeneral.PPM_Multiplier + 10, attr | PREC1 | RIGHT);
if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.PPM_Multiplier, -10, 40);
}
y += FH;
radio/src/gui/common/stdlcd/radio_version.cpp
+2 -2
View File
@@ -271,7 +271,7 @@ void menuRadioVersion(event_t event)
y += 5 * (FH - 1) + 2;
#if defined(PCBTARANIS)
lcdDrawText(INDENT_WIDTH, y, BUTTON(TR_FIRMWARE_OPTIONS), menuVerticalPosition == ITEM_RADIO_FIRMWARE_OPTIONS ? INVERS : 0);
lcdDrawText(INDENT_WIDTH, y, STR_FIRMWARE_OPTIONS, menuVerticalPosition == ITEM_RADIO_FIRMWARE_OPTIONS ? INVERS : 0);
y += FH;
if (menuVerticalPosition == ITEM_RADIO_FIRMWARE_OPTIONS && event == EVT_KEY_BREAK(KEY_ENTER)) {
s_editMode = EDIT_SELECT_FIELD;
@@ -280,7 +280,7 @@ void menuRadioVersion(event_t event)
#endif
#if defined(PXX2) || defined(CROSSFIRE)
lcdDrawText(INDENT_WIDTH, y, BUTTON(TR_MODULES_RX_VERSION), menuVerticalPosition == ITEM_RADIO_MODULES_VERSION ? INVERS : 0);
lcdDrawText(INDENT_WIDTH, y, STR_MODULES_RX_VERSION, menuVerticalPosition == ITEM_RADIO_MODULES_VERSION ? INVERS : 0);
y += FH;
if (menuVerticalPosition == ITEM_RADIO_MODULES_VERSION && event == EVT_KEY_BREAK(KEY_ENTER)) {
s_editMode = EDIT_SELECT_FIELD;
radio/src/gui/common/stdlcd/utf8.cpp
+1 -1
View File
@@ -23,7 +23,7 @@
#include <stdint.h>
#include "fonts.h"
#include "definitions.h"
#include "translations/untranslated.h"
#include "translations/translations.h"
#if defined(TRANSLATIONS_FR)
static uint16_t _utf8_lut[] = {