Skip to content

Commit c84a072

Browse files
lihuanhuanlihuanhuan
committed
fix(i18n): fix Korean display bug
1 parent ece7c1d commit c84a072

File tree

11 files changed

+32
-42
lines changed

11 files changed

+32
-42
lines changed

‎legacy/firmware/i18n/keys.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@
309309
#define T__SWITCH_INPUT_BRACKET_NUMBER 141
310310
// Switch Input (Symbol)
311311
#define T__SWITCH_INPUT_BRACKET_SYMBOL 142
312-
// Use This Passphrase?
312+
// Confirm Passphrase
313313
#define T__USE_THIS_PASSPHRASE_QUES 143
314314
// Access Hidden Wallet
315315
#define T__ACCESS_HIDDEN_WALLET 144

‎legacy/firmware/i18n/locales/de.inc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ const char *const languages_de[] = {
142142
"Eingabe wechseln (Großbuchstaben)",
143143
"Schalteingang (Nummer)",
144144
"Eingabe wechseln (Symbol)",
145-
"Passphrase verwenden?",
145+
"Passphrase bestätigen",
146146
"Hidden Wallet öffnen",
147147
"Der nächste Bildschirm zeigt die eingegebene Passphrase an.",
148148
"Bluetooth-Kopplung",

‎legacy/firmware/i18n/locales/en.inc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ const char *const languages_en[] = {
142142
"Switch Input (Uppercase)",
143143
"Switch Input (Number)",
144144
"Switch Input (Symbol)",
145-
"Use This Passphrase?",
145+
"Confirm Passphrase",
146146
"Access Hidden Wallet",
147147
"Next screen will show the entered Passphrase.",
148148
"Bluetooth Pair",

‎legacy/firmware/i18n/locales/es.inc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ const char *const languages_es[] = {
142142
"Cambiar Entrada (Mayús.)",
143143
"Cambiar Entrada (Número)",
144144
"Cambiar Entrada (Símbolo)",
145-
"¿Usar este passphrase?",
145+
"Confirmar Passphrase",
146146
"Acceder a Billetera Oculta",
147147
"La siguiente pantalla mostrará la Passphrase ingresada.",
148148
"Emparejar Bluetooth",

‎legacy/firmware/i18n/locales/ja.inc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ const char *const languages_ja[] = {
142142
"入力切替 (大文字)",
143143
"入力切替（数値）",
144144
"入力切替 (シンボル)",
145-
"Passphrase 使いますか？",
145+
"パスフレーズを確認",
146146
"ビュー 隠しウォレット",
147147
"次の画面で入力された Passphrase を表示します。",
148148
"Bluetooth ペア",

‎legacy/firmware/i18n/locales/ko_kr.inc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ const char *const languages_ko_kr[] = {
142142
"입력 전환(대문자)",
143143
"입력 전환(숫자)",
144144
"입력 전환(기호)",
145-
"이 Passphrase를 사용하시겠습니까?",
145+
"Passphrase 확인",
146146
"숨겨진 지갑에 접근",
147147
"다음 화면에 입력한 Passphrase가 표시됩니다.",
148148
"블루투스 페어링",

‎legacy/firmware/i18n/locales/pt_br.inc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ const char *const languages_pt_br[] = {
142142
"Trocar Entrada (Maiúsc.)",
143143
"Trocar Entrada (Número)",
144144
"Trocar Entrada (Símbolo)",
145-
"Usar esta Passphrase?",
145+
"Confirmar Passphrase",
146146
"Acessar Carteira Hidden",
147147
"A próxima tela mostrará a Passphrase inserida",
148148
"Pareamento Bluetooth",

‎legacy/firmware/i18n/locales/zh_cn.inc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ const char *const languages_zh_cn[] = {
142142
"切换输入法（大写字母）",
143143
"切换输入法（数字）",
144144
"切换输入法（符号）",
145-
"使用此 Passphrase？",
145+
"确认 Passphrase",
146146
"访问隐藏钱包",
147147
"接下来，屏幕中将展示您输入的 Passphrase。",
148148
"蓝牙配对",

‎legacy/firmware/i18n/locales/zh_tw.inc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ const char *const languages_zh_tw[] = {
142142
"切換輸入法（大寫字母）",
143143
"切換輸入法（數字）",
144144
"切換輸入法（符號）",
145-
"使用此 Passphrase？",
145+
"確認 Passphrase",
146146
"取用隱藏錢包",
147147
"接下來，螢幕中將展示您輸入的 Passphrase。",
148148
"藍牙配對",

‎legacy/firmware/layout2.c‎

Lines changed: 22 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2389,18 +2389,7 @@ static uint8_t layoutPagination(char *title, char *content) {
23892389
}
23902390

23912391
void layoutTxConfirmPage(const char *data) {
2392-
char line[64] = {0};
2393-
int rows = countlines((char *)data);
2394-
int p1 = line_index((char *)data, 1);
2395-
int p2 = line_index((char *)data, 2);
2396-
memcpy(line, data, p1);
2397-
oledDrawStringCenterAdapter(OLED_WIDTH / 2, 13 + 8, line, FONT_STANDARD);
2398-
memcpy(line, data + p1 + 1, p2 - p1);
2399-
oledDrawStringCenterAdapter(OLED_WIDTH / 2, 13 + 10 + 8, line, FONT_STANDARD);
2400-
if (rows > 2) {
2401-
oledDrawStringCenterAdapter(OLED_WIDTH / 2, 13 + 20 + 8, data + p2 + 1,
2402-
FONT_STANDARD);
2403-
}
2392+
oledDrawStringCenterAdapter(OLED_WIDTH / 2, 13 + 8, data, FONT_STANDARD);
24042393
}
24052394

24062395
bool layoutConfirmSafetyChecks(SafetyCheckLevel safety_ckeck_level,
@@ -3648,53 +3637,54 @@ bool layoutInputDirection(int direction) {
36483637
_(C__WHEN_ENTERING_PIN_CLICK_THE_UP_BTN_TO_DECREASE_AND_CLICK_THE_DOWN_BTN_TO_INCREASE));
36493638
}
36503639
switch (ui_language) {
3651-
case 0:
3640+
case I18N_LANG_EN:
36523641
if (direction) {
3653-
oledDrawBitmap(42, 22, &bmp_icon_up);
3642+
oledDrawBitmap(42, 21, &bmp_icon_up);
36543643
oledDrawBitmap(101, 30, &bmp_icon_down);
36553644
} else {
3656-
oledDrawBitmap(42, 22, &bmp_icon_up);
3657-
oledDrawBitmap(11, 40, &bmp_icon_down);
3645+
oledDrawBitmap(42, 21, &bmp_icon_up);
3646+
oledDrawBitmap(10, 39, &bmp_icon_down);
36583647
}
36593648
break;
3660-
case 1:
3661-
oledDrawBitmap(91, 17, &bmp_icon_up);
3662-
oledDrawBitmap(71, 28, &bmp_icon_down);
3649+
case I18N_LANG_ZH_CN:
3650+
case I18N_LANG_ZH_TW:
3651+
oledDrawBitmap(92, 17, &bmp_icon_up);
3652+
oledDrawBitmap(72, 27, &bmp_icon_down);
36633653
break;
3664-
case 2:
3665-
oledDrawBitmap(95, 17, &bmp_icon_up);
3666-
oledDrawBitmap(75, 28, &bmp_icon_down);
3667-
break;
3668-
case 3:
3654+
case I18N_LANG_JA:
36693655
if (direction) {
3670-
oledDrawBitmap(11, 22, &bmp_icon_up);
3656+
oledDrawBitmap(17, 22, &bmp_icon_up);
36713657
oledDrawBitmap(50, 32, &bmp_icon_down);
36723658
} else {
3673-
oledDrawBitmap(12, 22, &bmp_icon_up);
3674-
oledDrawBitmap(63, 32, &bmp_icon_down);
3659+
oledDrawBitmap(18, 22, &bmp_icon_up);
3660+
oledDrawBitmap(62, 32, &bmp_icon_down);
36753661
}
36763662
break;
3677-
case 4:
3663+
case I18N_LANG_ES:
36783664
oledDrawBitmap(65, 23, &bmp_icon_up);
3679-
oledDrawBitmap(6, 42, &bmp_icon_down);
3665+
oledDrawBitmap(5, 42, &bmp_icon_down);
36803666
break;
3681-
case 5:
3667+
case I18N_LANG_PT_BR:
36823668
oledDrawBitmap(36, 23, &bmp_icon_up);
36833669
if (direction) {
36843670
oledDrawBitmap(70, 32, &bmp_icon_down);
36853671
} else {
36863672
oledDrawBitmap(66, 32, &bmp_icon_down);
36873673
}
36883674
break;
3689-
case 6:
3675+
case I18N_LANG_DE:
36903676
if (direction) {
36913677
oledDrawBitmap(71, 17, &bmp_icon_up);
3692-
oledDrawBitmap(71, 28, &bmp_icon_down);
3678+
oledDrawBitmap(71, 27, &bmp_icon_down);
36933679
} else {
36943680
oledDrawBitmap(23, 22, &bmp_icon_down);
36953681
oledDrawBitmap(103, 32, &bmp_icon_up);
36963682
}
36973683
break;
3684+
case I18N_LANG_KO_KR:
3685+
oledDrawBitmap(83, 16, &bmp_icon_up);
3686+
oledDrawBitmap(105, 26, &bmp_icon_down);
3687+
break;
36983688
default:
36993689
break;
37003690
}

0 commit comments

Comments
 (0)