From 78e2bb05a2a256d54a9c9852b6ad6ed2e3483608 Mon Sep 17 00:00:00 2001 From: Peter Feerick Date: Sun, 9 Oct 2022 20:39:05 +1000 Subject: [PATCH] feat: CPP Widget names also translatable (#2454) * feat: CPP Widget names also translatable * chore: Add cn, cz, de, it, se, tw translations --- radio/src/gui/colorlcd/widgets/gauge.cpp | 3 ++- radio/src/gui/colorlcd/widgets/modelbmp.cpp | 3 ++- radio/src/gui/colorlcd/widgets/outputs.cpp | 3 ++- radio/src/gui/colorlcd/widgets/text.cpp | 3 ++- radio/src/gui/colorlcd/widgets/timer.cpp | 3 ++- radio/src/gui/colorlcd/widgets/value.cpp | 3 ++- radio/src/translations.cpp | 6 ++++++ radio/src/translations.h | 6 ++++++ radio/src/translations/cn.h | 8 +++++++- radio/src/translations/cz.h | 6 ++++++ radio/src/translations/da.h | 6 ++++++ radio/src/translations/de.h | 6 ++++++ radio/src/translations/en.h | 6 ++++++ radio/src/translations/es.h | 6 ++++++ radio/src/translations/fi.h | 6 ++++++ radio/src/translations/fr.h | 6 ++++++ radio/src/translations/it.h | 6 ++++++ radio/src/translations/nl.h | 6 ++++++ radio/src/translations/pl.h | 6 ++++++ radio/src/translations/pt.h | 6 ++++++ radio/src/translations/tw.h | 8 +++++++- 21 files changed, 104 insertions(+), 8 deletions(-) diff --git a/radio/src/gui/colorlcd/widgets/gauge.cpp b/radio/src/gui/colorlcd/widgets/gauge.cpp index 31ed7d4bf..9ff242103 100644 --- a/radio/src/gui/colorlcd/widgets/gauge.cpp +++ b/radio/src/gui/colorlcd/widgets/gauge.cpp @@ -82,4 +82,5 @@ const ZoneOption GaugeWidget::options[] = { { nullptr, ZoneOption::Bool } }; -BaseWidgetFactory gaugeWidget("Gauge", GaugeWidget::options); +BaseWidgetFactory gaugeWidget("Gauge", GaugeWidget::options, + STR_WIDGET_GAUGE); diff --git a/radio/src/gui/colorlcd/widgets/modelbmp.cpp b/radio/src/gui/colorlcd/widgets/modelbmp.cpp index 7da09bc3c..c8056c2e4 100644 --- a/radio/src/gui/colorlcd/widgets/modelbmp.cpp +++ b/radio/src/gui/colorlcd/widgets/modelbmp.cpp @@ -134,4 +134,5 @@ const ZoneOption ModelBitmapWidget::options[] = { {STR_USE_THEME_COLOR, ZoneOption::Bool, OPTION_VALUE_BOOL(true)}, {nullptr, ZoneOption::Bool}}; -BaseWidgetFactory modelBitmapWidget("ModelBmp", ModelBitmapWidget::options, "Models"); +BaseWidgetFactory modelBitmapWidget( + "ModelBmp", ModelBitmapWidget::options, STR_WIDGET_MODELBMP); diff --git a/radio/src/gui/colorlcd/widgets/outputs.cpp b/radio/src/gui/colorlcd/widgets/outputs.cpp index 108a51554..51a072d18 100644 --- a/radio/src/gui/colorlcd/widgets/outputs.cpp +++ b/radio/src/gui/colorlcd/widgets/outputs.cpp @@ -160,4 +160,5 @@ const ZoneOption OutputsWidget::options[] = { {nullptr, ZoneOption::Bool}}; BaseWidgetFactory outputsWidget("Outputs", - OutputsWidget::options); + OutputsWidget::options, + STR_WIDGET_OUTPUTS); diff --git a/radio/src/gui/colorlcd/widgets/text.cpp b/radio/src/gui/colorlcd/widgets/text.cpp index a1c8fdaf8..68cf6b0ef 100644 --- a/radio/src/gui/colorlcd/widgets/text.cpp +++ b/radio/src/gui/colorlcd/widgets/text.cpp @@ -60,4 +60,5 @@ const ZoneOption TextWidget::options[] = { { nullptr, ZoneOption::Bool } }; -BaseWidgetFactory textWidget("Text", TextWidget::options); +BaseWidgetFactory textWidget("Text", TextWidget::options, + STR_WIDGET_TEXT); diff --git a/radio/src/gui/colorlcd/widgets/timer.cpp b/radio/src/gui/colorlcd/widgets/timer.cpp index c36a4ea6f..dc2e047a4 100644 --- a/radio/src/gui/colorlcd/widgets/timer.cpp +++ b/radio/src/gui/colorlcd/widgets/timer.cpp @@ -167,4 +167,5 @@ const ZoneOption TimerWidget::options[] = { {STR_TIMER_SOURCE, ZoneOption::Timer, OPTION_VALUE_UNSIGNED(0)}, {nullptr, ZoneOption::Bool}}; -BaseWidgetFactory timerWidget("Timer", TimerWidget::options); +BaseWidgetFactory timerWidget("Timer", TimerWidget::options, + STR_WIDGET_TIMER); diff --git a/radio/src/gui/colorlcd/widgets/value.cpp b/radio/src/gui/colorlcd/widgets/value.cpp index 00d114eca..0208a6173 100644 --- a/radio/src/gui/colorlcd/widgets/value.cpp +++ b/radio/src/gui/colorlcd/widgets/value.cpp @@ -150,4 +150,5 @@ const ZoneOption ValueWidget::options[] = { { nullptr, ZoneOption::Bool } }; -BaseWidgetFactory ValueWidget("Value", ValueWidget::options); +BaseWidgetFactory ValueWidget("Value", ValueWidget::options, + STR_WIDGET_VALUE); diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index 787717a85..beb2dd7d8 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -802,6 +802,12 @@ const char STR_COLOR[] = TR_COLOR; const char STR_MAIN_VIEW_X[] = TR_MAIN_VIEW_X; const char STR_PANEL1_BACKGROUND[] = TR_PANEL1_BACKGROUND; const char STR_PANEL2_BACKGROUND[] = TR_PANEL2_BACKGROUND; +const char STR_WIDGET_GAUGE[] = TR_WIDGET_GAUGE; +const char STR_WIDGET_MODELBMP[] = TR_WIDGET_MODELBMP; +const char STR_WIDGET_OUTPUTS[] = TR_WIDGET_OUTPUTS; +const char STR_WIDGET_TEXT[] = TR_WIDGET_TEXT; +const char STR_WIDGET_TIMER[] = TR_WIDGET_TIMER; +const char STR_WIDGET_VALUE[] = TR_WIDGET_VALUE; const char STR_MODULES_RX_VERSION[] = TR_MODULES_RX_VERSION; #endif diff --git a/radio/src/translations.h b/radio/src/translations.h index 76c8e6ab8..16548af64 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -709,6 +709,12 @@ extern const char STR_COLOR[]; extern const char STR_MAIN_VIEW_X[]; extern const char STR_PANEL1_BACKGROUND[]; extern const char STR_PANEL2_BACKGROUND[]; +extern const char STR_WIDGET_GAUGE[]; +extern const char STR_WIDGET_MODELBMP[]; +extern const char STR_WIDGET_OUTPUTS[]; +extern const char STR_WIDGET_TEXT[]; +extern const char STR_WIDGET_TIMER[]; +extern const char STR_WIDGET_VALUE[]; extern const char STR_MODULES_RX_VERSION[]; #endif extern const char STR_EXECUTE_FILE[]; diff --git a/radio/src/translations/cn.h b/radio/src/translations/cn.h index 1037046c2..cf08ed38f 100644 --- a/radio/src/translations/cn.h +++ b/radio/src/translations/cn.h @@ -621,7 +621,7 @@ #define TR_SELECT_MODE "选择模式" #define TR_CREATE_MODEL "创建模型" #define TR_FAVORITE_LABEL "Favorites" -#define TR_MODELS_MOVED "Unused models moved to" +#define TR_MODELS_MOVED "未使用模型移至" #define TR_NEW_MODEL "New Model" #define TR_INVALID_MODEL "Invalid Model" #define TR_EDIT_LABELS "Edit Labels" @@ -1046,6 +1046,12 @@ #define TR_MAIN_VIEW_X "Main view X" #define TR_PANEL1_BACKGROUND "面板1背景" #define TR_PANEL2_BACKGROUND "面板2背景" +#define TR_WIDGET_GAUGE "行程" +#define TR_WIDGET_MODELBMP "模型信息" +#define TR_WIDGET_OUTPUTS "输出" +#define TR_WIDGET_TEXT "文本" +#define TR_WIDGET_TIMER "计时器" +#define TR_WIDGET_VALUE "数值" // About screen #define TR_ABOUTUS TR(" 关于 ", "关于") diff --git a/radio/src/translations/cz.h b/radio/src/translations/cz.h index fdfae6e77..fb0280710 100644 --- a/radio/src/translations/cz.h +++ b/radio/src/translations/cz.h @@ -1067,6 +1067,12 @@ #define TR_MAIN_VIEW_X "Hlavní pohled X" #define TR_PANEL1_BACKGROUND "Panel1 pozadí" #define TR_PANEL2_BACKGROUND "Panel2 pozadí" +#define TR_WIDGET_GAUGE "Měřidlo" +#define TR_WIDGET_MODELBMP "Model info" +#define TR_WIDGET_OUTPUTS "Výstupy" +#define TR_WIDGET_TEXT "Text" +#define TR_WIDGET_TIMER "Časovač" +#define TR_WIDGET_VALUE "Hodnota" // Taranis About screen #define TR_ABOUTUS "O nás" diff --git a/radio/src/translations/da.h b/radio/src/translations/da.h index a326bee4e..0fc374bae 100644 --- a/radio/src/translations/da.h +++ b/radio/src/translations/da.h @@ -1046,6 +1046,12 @@ #define TR_MAIN_VIEW_X "Hoved visning X" #define TR_PANEL1_BACKGROUND "Panel1 baggrund" #define TR_PANEL2_BACKGROUND "Panel2 baggrund" +#define TR_WIDGET_GAUGE "Gauge" +#define TR_WIDGET_MODELBMP "Models" +#define TR_WIDGET_OUTPUTS "Outputs" +#define TR_WIDGET_TEXT "Text" +#define TR_WIDGET_TIMER "Timer" +#define TR_WIDGET_VALUE "Value" // About screen #define TR_ABOUTUS TR(" OM ", "OM") diff --git a/radio/src/translations/de.h b/radio/src/translations/de.h index 1ee717940..9e3352166 100644 --- a/radio/src/translations/de.h +++ b/radio/src/translations/de.h @@ -1020,6 +1020,12 @@ #define TR_MAIN_VIEW_X "Hauptansicht X" #define TR_PANEL1_BACKGROUND "Panel1 Hintergrund" #define TR_PANEL2_BACKGROUND "Panel2 Hintergrund" +#define TR_WIDGET_GAUGE "Pegel" +#define TR_WIDGET_MODELBMP "Modellinfo" +#define TR_WIDGET_OUTPUTS "Ausgänge" +#define TR_WIDGET_TEXT "Text" +#define TR_WIDGET_TIMER "Timer" +#define TR_WIDGET_VALUE "Wert" // Taranis Info Zeile Anzeigen #define TR_LIMITS_HEADERS_NAME "Name" diff --git a/radio/src/translations/en.h b/radio/src/translations/en.h index 4ca7ec714..445798ab9 100644 --- a/radio/src/translations/en.h +++ b/radio/src/translations/en.h @@ -1046,6 +1046,12 @@ #define TR_MAIN_VIEW_X "Main view X" #define TR_PANEL1_BACKGROUND "Panel1 background" #define TR_PANEL2_BACKGROUND "Panel2 background" +#define TR_WIDGET_GAUGE "Gauge" +#define TR_WIDGET_MODELBMP "Model info" +#define TR_WIDGET_OUTPUTS "Outputs" +#define TR_WIDGET_TEXT "Text" +#define TR_WIDGET_TIMER "Timer" +#define TR_WIDGET_VALUE "Value" // About screen #define TR_ABOUTUS TR(" ABOUT ", "ABOUT") diff --git a/radio/src/translations/es.h b/radio/src/translations/es.h index 6e3ac2aad..cba6be341 100644 --- a/radio/src/translations/es.h +++ b/radio/src/translations/es.h @@ -1053,6 +1053,12 @@ #define TR_MAIN_VIEW_X "Vista principal X" #define TR_PANEL1_BACKGROUND "Fondo panel1" #define TR_PANEL2_BACKGROUND "Fondo panel2" +#define TR_WIDGET_GAUGE "Gauge" +#define TR_WIDGET_MODELBMP "Models" +#define TR_WIDGET_OUTPUTS "Outputs" +#define TR_WIDGET_TEXT "Text" +#define TR_WIDGET_TIMER "Timer" +#define TR_WIDGET_VALUE "Value" // Taranis About screen #define TR_ABOUTUS "Nosotros" diff --git a/radio/src/translations/fi.h b/radio/src/translations/fi.h index 38ca7d714..fec29efbf 100644 --- a/radio/src/translations/fi.h +++ b/radio/src/translations/fi.h @@ -1077,6 +1077,12 @@ #define TR_MAIN_VIEW_X "Main view X" #define TR_PANEL1_BACKGROUND "Panel1 background" #define TR_PANEL2_BACKGROUND "Panel2 background" +#define TR_WIDGET_GAUGE "Gauge" +#define TR_WIDGET_MODELBMP "Models" +#define TR_WIDGET_OUTPUTS "Outputs" +#define TR_WIDGET_TEXT "Text" +#define TR_WIDGET_TIMER "Timer" +#define TR_WIDGET_VALUE "Value" // About screen #define TR_ABOUTUS TR(" ABOUT ", "ABOUT") diff --git a/radio/src/translations/fr.h b/radio/src/translations/fr.h index 438bd68b3..b727cafdb 100644 --- a/radio/src/translations/fr.h +++ b/radio/src/translations/fr.h @@ -1077,6 +1077,12 @@ #define TR_MAIN_VIEW_X "Main view X" #define TR_PANEL1_BACKGROUND "Panel1 background" #define TR_PANEL2_BACKGROUND "Panel2 background" +#define TR_WIDGET_GAUGE "Gauge" +#define TR_WIDGET_MODELBMP "Models" +#define TR_WIDGET_OUTPUTS "Outputs" +#define TR_WIDGET_TEXT "Text" +#define TR_WIDGET_TIMER "Timer" +#define TR_WIDGET_VALUE "Value" // Taranis About screen #define TR_ABOUTUS TR(" A PROPOS ", "A PROPOS") diff --git a/radio/src/translations/it.h b/radio/src/translations/it.h index 5754d3588..754c8b849 100644 --- a/radio/src/translations/it.h +++ b/radio/src/translations/it.h @@ -1051,6 +1051,12 @@ #define TR_MAIN_VIEW_X "Vista principale X" #define TR_PANEL1_BACKGROUND "Sfondo Panello 1" #define TR_PANEL2_BACKGROUND "Sfondo Panello 2" +#define TR_WIDGET_GAUGE "Indicatore" +#define TR_WIDGET_MODELBMP "Immagine e nome modello" +#define TR_WIDGET_OUTPUTS "Uscite" +#define TR_WIDGET_TEXT "Testo" +#define TR_WIDGET_TIMER "Timer" +#define TR_WIDGET_VALUE "Valore" // About screen #define TR_ABOUTUS TR(" INFO ", "INFO SU") diff --git a/radio/src/translations/nl.h b/radio/src/translations/nl.h index 4b449cc07..573e08fe2 100644 --- a/radio/src/translations/nl.h +++ b/radio/src/translations/nl.h @@ -1061,6 +1061,12 @@ #define TR_MAIN_VIEW_X "Main view X" #define TR_PANEL1_BACKGROUND "Panel1 background" #define TR_PANEL2_BACKGROUND "Panel2 background" +#define TR_WIDGET_GAUGE "Gauge" +#define TR_WIDGET_MODELBMP "Models" +#define TR_WIDGET_OUTPUTS "Outputs" +#define TR_WIDGET_TEXT "Text" +#define TR_WIDGET_TIMER "Timer" +#define TR_WIDGET_VALUE "Value" // About screen #define TR_ABOUTUS TR(" ABOUT ", "ABOUT") diff --git a/radio/src/translations/pl.h b/radio/src/translations/pl.h index 455afbb58..d3fb4b172 100644 --- a/radio/src/translations/pl.h +++ b/radio/src/translations/pl.h @@ -1046,6 +1046,12 @@ #define TR_MAIN_VIEW_X "Main view X" #define TR_PANEL1_BACKGROUND "Panel1 background" #define TR_PANEL2_BACKGROUND "Panel2 background" +#define TR_WIDGET_GAUGE "Gauge" +#define TR_WIDGET_MODELBMP "Models" +#define TR_WIDGET_OUTPUTS "Outputs" +#define TR_WIDGET_TEXT "Text" +#define TR_WIDGET_TIMER "Timer" +#define TR_WIDGET_VALUE "Value" // About screen #define TR_ABOUTUS TR(" O ", " O ") diff --git a/radio/src/translations/pt.h b/radio/src/translations/pt.h index c20c82040..a569306e3 100644 --- a/radio/src/translations/pt.h +++ b/radio/src/translations/pt.h @@ -1052,6 +1052,12 @@ #define TR_MAIN_VIEW_X "Main view X" #define TR_PANEL1_BACKGROUND "Panel1 background" #define TR_PANEL2_BACKGROUND "Panel2 background" +#define TR_WIDGET_GAUGE "Gauge" +#define TR_WIDGET_MODELBMP "Models" +#define TR_WIDGET_OUTPUTS "Outputs" +#define TR_WIDGET_TEXT "Text" +#define TR_WIDGET_TIMER "Timer" +#define TR_WIDGET_VALUE "Value" // Taranis About screen #define TR_ABOUTUS "ABOUT US" diff --git a/radio/src/translations/tw.h b/radio/src/translations/tw.h index 7f345e73f..9f3353cfd 100644 --- a/radio/src/translations/tw.h +++ b/radio/src/translations/tw.h @@ -621,7 +621,7 @@ #define TR_SELECT_MODE "選擇模式" #define TR_CREATE_MODEL "創建模型" #define TR_FAVORITE_LABEL "Favorites" -#define TR_MODELS_MOVED "Unused models moved to" +#define TR_MODELS_MOVED "未使用模型移至" #define TR_NEW_MODEL "New Model" #define TR_INVALID_MODEL "Invalid Model" #define TR_EDIT_LABELS "Edit Labels" @@ -1046,6 +1046,12 @@ #define TR_MAIN_VIEW_X "Main view X" #define TR_PANEL1_BACKGROUND "面板1背景" #define TR_PANEL2_BACKGROUND "面板2背景" +#define TR_WIDGET_GAUGE "行程" +#define TR_WIDGET_MODELBMP "模型信息" +#define TR_WIDGET_OUTPUTS "輸出" +#define TR_WIDGET_TEXT "文本" +#define TR_WIDGET_TIMER "計時器" +#define TR_WIDGET_VALUE "數值" // About screen #define TR_ABOUTUS TR(" 關於 ", "關於")