From 32c1613e0dabd4d8873be9b96bd421e22008acba Mon Sep 17 00:00:00 2001 From: obrusvit Date: Sun, 23 Feb 2025 11:36:18 +0100 Subject: [PATCH] chore(eckhart): de-duplicate "Keep holding" TStr --- core/embed/rust/librust_qstr.h | 1 - .../translations/generated/translated_string.rs | 14 +++++++++----- .../src/ui/layout_eckhart/component/action_bar.rs | 2 +- core/mocks/trezortranslate_keys.pyi | 3 +-- core/translations/en.json | 3 +-- core/translations/order.json | 3 +-- core/translations/signatures.json | 6 +++--- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/core/embed/rust/librust_qstr.h b/core/embed/rust/librust_qstr.h index 8e3c111cf0..5810c6be62 100644 --- a/core/embed/rust/librust_qstr.h +++ b/core/embed/rust/librust_qstr.h @@ -290,7 +290,6 @@ static void _librust_qstrs(void) { MP_QSTR_instructions__hold_to_exit_tutorial; MP_QSTR_instructions__hold_to_finish_tutorial; MP_QSTR_instructions__hold_to_sign; - MP_QSTR_instructions__keep_holding; MP_QSTR_instructions__learn_more; MP_QSTR_instructions__shares_continue_with_x_template; MP_QSTR_instructions__shares_start_with_1; diff --git a/core/embed/rust/src/translations/generated/translated_string.rs b/core/embed/rust/src/translations/generated/translated_string.rs index 0605435da5..8616c9df5f 100644 --- a/core/embed/rust/src/translations/generated/translated_string.rs +++ b/core/embed/rust/src/translations/generated/translated_string.rs @@ -1286,7 +1286,7 @@ pub enum TranslatedString { haptic_feedback__enable = 885, // "Enable haptic feedback?" haptic_feedback__subtitle = 886, // "Setting" haptic_feedback__title = 887, // "Haptic feedback" - instructions__continue_holding = 888, // "Continue\nholding" + instructions__continue_holding = 888, // {"Bolt": "", "Caesar": "", "Delizia": "Continue\nholding", "Eckhart": "Keep holding"} instructions__enter_next_share = 889, // "Enter next share" instructions__hold_to_continue = 890, // "Hold to continue" instructions__hold_to_exit_tutorial = 891, // "Hold to exit tutorial" @@ -1382,8 +1382,7 @@ pub enum TranslatedString { misc__enable_labeling = 973, // "Enable labeling?" #[cfg(feature = "universal_fw")] ethereum__unknown_contract_address_short = 974, // "Unknown contract address." - instructions__keep_holding = 975, // "Keep holding" - reset__share_words_first = 976, // "Write down the first word from the backup." + reset__share_words_first = 975, // "Write down the first word from the backup." } impl TranslatedString { @@ -2673,7 +2672,14 @@ impl TranslatedString { Self::haptic_feedback__enable => "Enable haptic feedback?", Self::haptic_feedback__subtitle => "Setting", Self::haptic_feedback__title => "Haptic feedback", + #[cfg(feature = "layout_bolt")] + Self::instructions__continue_holding => "", + #[cfg(feature = "layout_caesar")] + Self::instructions__continue_holding => "", + #[cfg(feature = "layout_delizia")] Self::instructions__continue_holding => "Continue\nholding", + #[cfg(feature = "layout_eckhart")] + Self::instructions__continue_holding => "Keep holding", Self::instructions__enter_next_share => "Enter next share", Self::instructions__hold_to_continue => "Hold to continue", Self::instructions__hold_to_exit_tutorial => "Hold to exit tutorial", @@ -2776,7 +2782,6 @@ impl TranslatedString { Self::misc__enable_labeling => "Enable labeling?", #[cfg(feature = "universal_fw")] Self::ethereum__unknown_contract_address_short => "Unknown contract address.", - Self::instructions__keep_holding => "Keep holding", Self::reset__share_words_first => "Write down the first word from the backup.", } } @@ -4155,7 +4160,6 @@ impl TranslatedString { Qstr::MP_QSTR_misc__enable_labeling => Some(Self::misc__enable_labeling), #[cfg(feature = "universal_fw")] Qstr::MP_QSTR_ethereum__unknown_contract_address_short => Some(Self::ethereum__unknown_contract_address_short), - Qstr::MP_QSTR_instructions__keep_holding => Some(Self::instructions__keep_holding), Qstr::MP_QSTR_reset__share_words_first => Some(Self::reset__share_words_first), _ => None, } diff --git a/core/embed/rust/src/ui/layout_eckhart/component/action_bar.rs b/core/embed/rust/src/ui/layout_eckhart/component/action_bar.rs index 995f73b17a..a1ea5b485d 100644 --- a/core/embed/rust/src/ui/layout_eckhart/component/action_bar.rs +++ b/core/embed/rust/src/ui/layout_eckhart/component/action_bar.rs @@ -144,7 +144,7 @@ impl ActionBar { .map(|dur| { HoldToConfirmAnim::new() .with_duration(dur) - .with_header_overlay(TR::instructions__keep_holding.into()) + .with_header_overlay(TR::instructions__continue_holding.into()) }); Self { diff --git a/core/mocks/trezortranslate_keys.pyi b/core/mocks/trezortranslate_keys.pyi index 76bba5b497..bb3c05c898 100644 --- a/core/mocks/trezortranslate_keys.pyi +++ b/core/mocks/trezortranslate_keys.pyi @@ -386,14 +386,13 @@ class TR: inputs__return: str = "RETURN" inputs__show: str = "SHOW" inputs__space: str = "SPACE" - instructions__continue_holding: str = "Continue\nholding" + instructions__continue_holding: str = "" instructions__continue_in_app: str = "Continue in the app" instructions__enter_next_share: str = "Enter next share" instructions__hold_to_confirm: str = "Hold to confirm" instructions__hold_to_continue: str = "Hold to continue" instructions__hold_to_exit_tutorial: str = "Hold to exit tutorial" instructions__hold_to_sign: str = "Hold to sign" - instructions__keep_holding: str = "Keep holding" instructions__learn_more: str = "Learn more" instructions__shares_continue_with_x_template: str = "Continue with Share #{0}" instructions__shares_start_with_1: str = "Start with share #1" diff --git a/core/translations/en.json b/core/translations/en.json index 1a5263944f..ae7c9bb17c 100644 --- a/core/translations/en.json +++ b/core/translations/en.json @@ -388,14 +388,13 @@ "inputs__return": "RETURN", "inputs__show": "SHOW", "inputs__space": "SPACE", - "instructions__continue_holding": "Continue\nholding", + "instructions__continue_holding": {"Bolt": "", "Caesar": "", "Delizia": "Continue\nholding", "Eckhart": "Keep holding"}, "instructions__continue_in_app": "Continue in the app", "instructions__enter_next_share": "Enter next share", "instructions__hold_to_confirm": "Hold to confirm", "instructions__hold_to_continue": "Hold to continue", "instructions__hold_to_exit_tutorial": "Hold to exit tutorial", "instructions__hold_to_sign": "Hold to sign", - "instructions__keep_holding": "Keep holding", "instructions__learn_more": "Learn more", "instructions__shares_continue_with_x_template": "Continue with Share #{0}", "instructions__shares_start_with_1": "Start with share #1", diff --git a/core/translations/order.json b/core/translations/order.json index 10cd796855..95f2852ba8 100644 --- a/core/translations/order.json +++ b/core/translations/order.json @@ -974,6 +974,5 @@ "972": "ethereum__interaction_contract", "973": "misc__enable_labeling", "974": "ethereum__unknown_contract_address_short", - "975": "instructions__keep_holding", - "976": "reset__share_words_first" + "975": "reset__share_words_first" } diff --git a/core/translations/signatures.json b/core/translations/signatures.json index 70066928b7..8f101657db 100644 --- a/core/translations/signatures.json +++ b/core/translations/signatures.json @@ -1,8 +1,8 @@ { "current": { - "merkle_root": "31454a46346717afd55e29f2a23f6cf64e4e23679af127d774895aa3a700c764", - "datetime": "2025-02-18T22:33:29.769368", - "commit": "778d5265dc258c1b0b74e8433acbd08d090b8746" + "merkle_root": "43c08e81d71c1c28d77b1650fc96b0dfcd473fde0c922717e5588baeeb581bd3", + "datetime": "2025-02-23T10:34:37.757428", + "commit": "2cece8147342db58e5429f21679814b7bd2db280" }, "history": [ {