Skip to content

Commit 2117037

Browse files
authored
replacing _L_ON/OFF with _L_ON_F/OFF_F
where it makes sense. And fixing the translation of the lines “freed” by this in order to more elegantly display what they are left to display now.
1 parent dec79b4 commit 2117037

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

fw/application/src/app/amiidb/scene/amiidb_scene_amiibo_detail_menu.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ static void amiidb_scene_amiibo_detail_menu_on_selected(mui_list_view_event_t ev
9595
char txt[32];
9696
settings_data_t *p_settings = settings_get_data();
9797
p_settings->auto_gen_amiibo = !p_settings->auto_gen_amiibo;
98-
snprintf(txt, sizeof(txt), "[%s]",
99-
p_settings->auto_gen_amiibo ? getLangString(_L_ON) : getLangString(_L_OFF));
98+
snprintf(txt, sizeof(txt), "%s",
99+
p_settings->auto_gen_amiibo ? getLangString(_L_ON_F) : getLangString(_L_OFF_F));
100100
settings_save();
101101

102102
string_set_str(p_item->sub_text, txt);
@@ -108,7 +108,7 @@ static void amiidb_scene_amiibo_detail_menu_on_selected(mui_list_view_event_t ev
108108
char txt[32];
109109
settings_data_t *p_settings = settings_get_data();
110110
p_settings->qrcode_enabled = !p_settings->qrcode_enabled;
111-
snprintf(txt, sizeof(txt), "[%s]", p_settings->qrcode_enabled ? getLangString(_L_ON) : getLangString(_L_OFF));
111+
snprintf(txt, sizeof(txt), "%s", p_settings->qrcode_enabled ? getLangString(_L_ON_F) : getLangString(_L_OFF_F));
112112
settings_save();
113113

114114
string_set_str(p_item->sub_text, txt);
@@ -139,11 +139,11 @@ void amiidb_scene_amiibo_detail_menu_on_enter(void *user_data) {
139139
char txt[32];
140140
settings_data_t *p_settings = settings_get_data();
141141

142-
snprintf(txt, sizeof(txt), "[%s]", p_settings->auto_gen_amiibo ? getLangString(_L_ON) : getLangString(_L_OFF));
142+
snprintf(txt, sizeof(txt), "%s", p_settings->auto_gen_amiibo ? getLangString(_L_ON_F) : getLangString(_L_OFF_F));
143143
mui_list_view_add_item_ext(app->p_list_view, 0xe1c6, getLangString(_L_AUTO_RANDOM_GENERATION), txt,
144144
(void *)AMIIDB_DETAIL_MENU_AUTO_RAND_UID);
145145

146-
snprintf(txt, sizeof(txt), "[%s]", p_settings->qrcode_enabled ? getLangString(_L_ON) : getLangString(_L_OFF));
146+
snprintf(txt, sizeof(txt), "%s", p_settings->qrcode_enabled ? getLangString(_L_ON_F) : getLangString(_L_OFF_F));
147147
mui_list_view_add_item_ext(app->p_list_view, 0xe006, getLangString(_L_SHOW_QRCODE), txt,
148148
(void *)AMIIDB_DETAIL_MENU_SHOW_QRCODE);
149149
mui_list_view_add_item(app->p_list_view, ICON_FAVORITE, getLangString(_L_APP_AMIIDB_DETAIL_FAVORITE),

fw/application/src/app/settings/scene/settings_scene_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ static void settings_scene_main_reload(void *user_data) {
169169
(void *)SETTINGS_MAIN_MENU_OLED_CONTRAST);
170170
#else
171171
if (p_settings->lcd_backlight == 0) {
172-
snprintf(txt, sizeof(txt), "[%s]", getLangString(_L_OFF));
172+
snprintf(txt, sizeof(txt), "%s", getLangString(_L_OFF_F));
173173
} else {
174174
snprintf(txt, sizeof(txt), "[%d%%]", p_settings->lcd_backlight);
175175
}

fw/application/src/i18n/ru_RU.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "string_id.h"
22
const char * const lang_ru_RU[_L_COUNT] = {
3-
[_L_ON] = "Вкл",
4-
[_L_OFF] = "Выкл",
3+
[_L_ON] = "Включено",
4+
[_L_OFF] = "Выключено",
55
[_L_ON_F] = "[Вкл]",
66
[_L_OFF_F] = "[Выкл]",
77
[_L_BACK] = "[Назад]",

fw/data/i18n.csv

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
CODE,en_US,zh_Hans,zh_TW,es_ES,hu_HU,de_DE,fr_FR,nl_NL,pt_BR,ja_JP,it_IT,ru_RU
2-
_L_ON,ON,开,開,SI,BE,AN,ACTIVÉ,AAN,LIGADO,オン,SI,Вкл
3-
_L_OFF,OFF,关,關,NO,KI,AUS,DÉSACTIVÉ,UIT,DESLIGADO,オフ,NO,Выкл
2+
_L_ON,ON,开,開,SI,BE,AN,ACTIVÉ,AAN,LIGADO,オン,SI,Включено
3+
_L_OFF,OFF,关,關,NO,KI,AUS,DÉSACTIVÉ,UIT,DESLIGADO,オフ,NO,Выключено
44
_L_ON_F,[ON],[开],[開],[SI],[BE],[AN],[ACTIVÉ],[AAN],[LIGADO],[オン],[SI],[Вкл]
55
_L_OFF_F,[OFF],[关],[關],[NO],[KI],[AUS],[DÉSACTIVÉ],[UIT],[DESLIGADO],[オフ],[NO],[Выкл]
66
_L_BACK,Back,返回,返回,[Atrás],Vissza,Zurück,Retour,Terug,Voltar,戻る,Indietro,[Назад]

0 commit comments

Comments
 (0)