1
0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-02-27 06:42:02 +00:00

fix(core): change "Swipe up" to "Tap to continue" everywhere

This commit is contained in:
matejcik 2025-02-21 13:49:04 +01:00 committed by Vít Obrusník
parent f04b022662
commit 6441d41646
19 changed files with 23 additions and 17 deletions

View File

@ -296,6 +296,7 @@ static void _librust_qstrs(void) {
MP_QSTR_instructions__swipe_horizontally; MP_QSTR_instructions__swipe_horizontally;
MP_QSTR_instructions__swipe_up; MP_QSTR_instructions__swipe_up;
MP_QSTR_instructions__tap_to_confirm; MP_QSTR_instructions__tap_to_confirm;
MP_QSTR_instructions__tap_to_continue;
MP_QSTR_instructions__tap_to_start; MP_QSTR_instructions__tap_to_start;
MP_QSTR_instructions__view_all_data; MP_QSTR_instructions__view_all_data;
MP_QSTR_is_data; MP_QSTR_is_data;

View File

@ -1402,6 +1402,7 @@ pub enum TranslatedString {
#[cfg(feature = "universal_fw")] #[cfg(feature = "universal_fw")]
solana__stake_on_question = 989, // "Stake SOL on {0}?" solana__stake_on_question = 989, // "Stake SOL on {0}?"
sign_message__confirm_without_review = 990, // "Confirm without review" sign_message__confirm_without_review = 990, // "Confirm without review"
instructions__tap_to_continue = 991, // "Tap to continue"
} }
impl TranslatedString { impl TranslatedString {
@ -2800,6 +2801,7 @@ impl TranslatedString {
#[cfg(feature = "universal_fw")] #[cfg(feature = "universal_fw")]
Self::solana__stake_on_question => "Stake SOL on {0}?", Self::solana__stake_on_question => "Stake SOL on {0}?",
Self::sign_message__confirm_without_review => "Confirm without review", Self::sign_message__confirm_without_review => "Confirm without review",
Self::instructions__tap_to_continue => "Tap to continue",
} }
} }
@ -4197,6 +4199,7 @@ impl TranslatedString {
#[cfg(feature = "universal_fw")] #[cfg(feature = "universal_fw")]
Qstr::MP_QSTR_solana__stake_on_question => Some(Self::solana__stake_on_question), Qstr::MP_QSTR_solana__stake_on_question => Some(Self::solana__stake_on_question),
Qstr::MP_QSTR_sign_message__confirm_without_review => Some(Self::sign_message__confirm_without_review), Qstr::MP_QSTR_sign_message__confirm_without_review => Some(Self::sign_message__confirm_without_review),
Qstr::MP_QSTR_instructions__tap_to_continue => Some(Self::instructions__tap_to_continue),
_ => None, _ => None,
} }
} }

View File

@ -202,7 +202,7 @@ where
pub fn with_swipeup_footer(self, description: Option<TString<'static>>) -> Self { pub fn with_swipeup_footer(self, description: Option<TString<'static>>) -> Self {
use crate::translations::TR; use crate::translations::TR;
self.with_footer(TR::instructions__swipe_up.into(), description) self.with_footer(TR::instructions__tap_to_continue.into(), description)
.with_swipe(Direction::Up, SwipeSettings::default()) .with_swipe(Direction::Up, SwipeSettings::default())
} }

View File

@ -84,7 +84,7 @@ impl Component for NumberInputSliderDialog {
ctx.request_paint(); ctx.request_paint();
} else { } else {
self.footer self.footer
.update_instruction(ctx, TR::instructions__swipe_up); .update_instruction(ctx, TR::instructions__tap_to_continue);
self.footer.update_description(ctx, TR::setting__apply); self.footer.update_description(ctx, TR::setting__apply);
ctx.request_paint(); ctx.request_paint();
} }

View File

@ -298,7 +298,7 @@ fn new_confirm_action_uni<T: Component + PaginateFull + MaybeTrace + 'static>(
} }
content = content content = content
.with_footer_counter(TR::instructions__swipe_up.into()) .with_footer_counter(TR::instructions__tap_to_continue.into())
.register_footer_update_fn(footer_update_fn::<T>); .register_footer_update_fn(footer_update_fn::<T>);
} }

View File

@ -144,7 +144,7 @@ pub fn new_confirm_fido(
.with_footer_page_hint( .with_footer_page_hint(
TR::fido__more_credentials.into(), TR::fido__more_credentials.into(),
TR::buttons__go_back.into(), TR::buttons__go_back.into(),
TR::instructions__swipe_up.into(), TR::instructions__tap_to_continue.into(),
TR::instructions__swipe_down.into(), TR::instructions__swipe_down.into(),
) )
.register_footer_update_fn(footer_update_fn) .register_footer_update_fn(footer_update_fn)

View File

@ -270,7 +270,7 @@ pub fn new_continue_recovery_homepage(
.map(super::util::map_to_choice); .map(super::util::map_to_choice);
let (footer_instruction, footer_description) = ( let (footer_instruction, footer_description) = (
TR::instructions__swipe_up.into(), TR::instructions__tap_to_continue.into(),
TR::recovery__more_shares_needed.into(), TR::recovery__more_shares_needed.into(),
); );
let n_remaining_shares = pages.as_ref().unwrap().len() / 2; let n_remaining_shares = pages.as_ref().unwrap().len() / 2;

View File

@ -110,7 +110,7 @@ pub fn new_show_share_words(
.with_vertical_pages() .with_vertical_pages()
.with_subtitle(subtitle) .with_subtitle(subtitle)
.register_header_update_fn(header_updating_func) .register_header_update_fn(header_updating_func)
.with_footer_counter(TR::instructions__swipe_up.into()) .with_footer_counter(TR::instructions__tap_to_continue.into())
.register_footer_update_fn(footer_updating_func) .register_footer_update_fn(footer_updating_func)
.map_to_button_msg(); .map_to_button_msg();

View File

@ -175,7 +175,7 @@ impl ConfirmValue {
pub const fn with_swipeup_footer(self, description: Option<TString<'static>>) -> Self { pub const fn with_swipeup_footer(self, description: Option<TString<'static>>) -> Self {
self.with_footer( self.with_footer(
TString::from_translation(TR::instructions__swipe_up), TString::from_translation(TR::instructions__tap_to_continue),
description, description,
) )
.with_swipe_up() .with_swipe_up()
@ -385,7 +385,7 @@ impl ShowInfoParams {
pub const fn with_swipeup_footer(self, description: Option<TString<'static>>) -> Self { pub const fn with_swipeup_footer(self, description: Option<TString<'static>>) -> Self {
self.with_footer( self.with_footer(
TString::from_translation(TR::instructions__swipe_up), TString::from_translation(TR::instructions__tap_to_continue),
description, description,
) )
.with_swipe_up() .with_swipe_up()

View File

@ -9,7 +9,6 @@ use crate::{
ui::{ ui::{
component::{ component::{
connect::Connect, connect::Connect,
swipe_detect::SwipeSettings,
text::{ text::{
op::OpTextLayout, op::OpTextLayout,
paragraphs::{ paragraphs::{
@ -20,7 +19,7 @@ use crate::{
}, },
Border, CachedJpeg, ComponentExt, Empty, FormattedText, Never, Timeout, Border, CachedJpeg, ComponentExt, Empty, FormattedText, Never, Timeout,
}, },
geometry::{self, Direction, Offset}, geometry::{self, Offset},
layout::{ layout::{
obj::{LayoutMaybeTrace, LayoutObj, RootComponent}, obj::{LayoutMaybeTrace, LayoutObj, RootComponent},
util::{PropsList, RecoveryType}, util::{PropsList, RecoveryType},

View File

@ -400,6 +400,7 @@ class TR:
instructions__swipe_horizontally: str = "Swipe horizontally" instructions__swipe_horizontally: str = "Swipe horizontally"
instructions__swipe_up: str = "Swipe up" instructions__swipe_up: str = "Swipe up"
instructions__tap_to_confirm: str = "Tap to confirm" instructions__tap_to_confirm: str = "Tap to confirm"
instructions__tap_to_continue: str = "Tap to continue"
instructions__tap_to_start: str = "Tap to start" instructions__tap_to_start: str = "Tap to start"
instructions__view_all_data: str = "View all data in the menu." instructions__view_all_data: str = "View all data in the menu."
joint__title: str = "Joint transaction" joint__title: str = "Joint transaction"

View File

@ -442,7 +442,7 @@
"instructions__shares_start_with_1": "Začněte částí č. 1", "instructions__shares_start_with_1": "Začněte částí č. 1",
"instructions__swipe_down": "Přejeďte prstem dolů", "instructions__swipe_down": "Přejeďte prstem dolů",
"instructions__swipe_horizontally": "Přejeďte prstem vodorovně", "instructions__swipe_horizontally": "Přejeďte prstem vodorovně",
"instructions__swipe_up": "Přejeďte prstem nahoru", "instructions__tap_to_continue": "Klepnutím pokračujte",
"instructions__tap_to_confirm": "Klepnutím potvrďte", "instructions__tap_to_confirm": "Klepnutím potvrďte",
"instructions__tap_to_start": "Začněte klepnutím", "instructions__tap_to_start": "Začněte klepnutím",
"instructions__view_all_data": "Zobrazit všechna data v menu.", "instructions__view_all_data": "Zobrazit všechna data v menu.",

View File

@ -442,7 +442,7 @@
"instructions__shares_start_with_1": "Mit Share #1 beginnen", "instructions__shares_start_with_1": "Mit Share #1 beginnen",
"instructions__swipe_down": "Nach unten wischen", "instructions__swipe_down": "Nach unten wischen",
"instructions__swipe_horizontally": "Zur Seite wischen", "instructions__swipe_horizontally": "Zur Seite wischen",
"instructions__swipe_up": "Nach oben wischen", "instructions__tap_to_continue": "Zum Fortfahren tippen",
"instructions__tap_to_confirm": "Zum Bestätigen tippen", "instructions__tap_to_confirm": "Zum Bestätigen tippen",
"instructions__tap_to_start": "Zum Beginnen tippen", "instructions__tap_to_start": "Zum Beginnen tippen",
"instructions__view_all_data": "Alle Daten im Menü sehen.", "instructions__view_all_data": "Alle Daten im Menü sehen.",

View File

@ -402,6 +402,7 @@
"instructions__swipe_horizontally": "Swipe horizontally", "instructions__swipe_horizontally": "Swipe horizontally",
"instructions__swipe_up": "Swipe up", "instructions__swipe_up": "Swipe up",
"instructions__tap_to_confirm": "Tap to confirm", "instructions__tap_to_confirm": "Tap to confirm",
"instructions__tap_to_continue": "Tap to continue",
"instructions__tap_to_start": "Tap to start", "instructions__tap_to_start": "Tap to start",
"instructions__view_all_data": "View all data in the menu.", "instructions__view_all_data": "View all data in the menu.",
"joint__title": "Joint transaction", "joint__title": "Joint transaction",

View File

@ -442,7 +442,7 @@
"instructions__shares_start_with_1": "Empezar con el rec. n.º 1", "instructions__shares_start_with_1": "Empezar con el rec. n.º 1",
"instructions__swipe_down": "Deslizar hacia abajo", "instructions__swipe_down": "Deslizar hacia abajo",
"instructions__swipe_horizontally": "Deslizar en horizontal", "instructions__swipe_horizontally": "Deslizar en horizontal",
"instructions__swipe_up": "Desliza hacia arriba", "instructions__tap_to_continue": "Toca para continuar",
"instructions__tap_to_confirm": "Toca para confirmar", "instructions__tap_to_confirm": "Toca para confirmar",
"instructions__tap_to_start": "Toca para empezar", "instructions__tap_to_start": "Toca para empezar",
"instructions__view_all_data": "Ver todos los datos en el menú.", "instructions__view_all_data": "Ver todos los datos en el menú.",

View File

@ -442,7 +442,7 @@
"instructions__shares_start_with_1": "Commencez avec le fragment #1", "instructions__shares_start_with_1": "Commencez avec le fragment #1",
"instructions__swipe_down": "Glisser vers le bas", "instructions__swipe_down": "Glisser vers le bas",
"instructions__swipe_horizontally": "Glisser horizontalement", "instructions__swipe_horizontally": "Glisser horizontalement",
"instructions__swipe_up": "Faites glisser vers le haut", "instructions__tap_to_continue": "Appuyez pour continuer",
"instructions__tap_to_confirm": "Appuyez pour confirmer", "instructions__tap_to_confirm": "Appuyez pour confirmer",
"instructions__tap_to_start": "Appuyez pour démarrer", "instructions__tap_to_start": "Appuyez pour démarrer",
"instructions__view_all_data": "Voir toutes les données dans le menu.", "instructions__view_all_data": "Voir toutes les données dans le menu.",

View File

@ -442,7 +442,7 @@
"instructions__shares_start_with_1": "Inizia con azione n. 1", "instructions__shares_start_with_1": "Inizia con azione n. 1",
"instructions__swipe_down": "Scorri in basso", "instructions__swipe_down": "Scorri in basso",
"instructions__swipe_horizontally": "Scorri in orizzontale", "instructions__swipe_horizontally": "Scorri in orizzontale",
"instructions__swipe_up": "Scorri in alto", "instructions__tap_to_continue": "Tocca e continua",
"instructions__tap_to_confirm": "Tocca e conferma", "instructions__tap_to_confirm": "Tocca e conferma",
"instructions__tap_to_start": "Tocca e inizia", "instructions__tap_to_start": "Tocca e inizia",
"instructions__view_all_data": "Visualizza tutti i dati nel menu.", "instructions__view_all_data": "Visualizza tutti i dati nel menu.",

View File

@ -989,5 +989,6 @@
"987": "solana__unstake_question", "987": "solana__unstake_question",
"988": "solana__vote_account", "988": "solana__vote_account",
"989": "solana__stake_on_question", "989": "solana__stake_on_question",
"990": "sign_message__confirm_without_review" "990": "sign_message__confirm_without_review",
"991": "instructions__tap_to_continue"
} }

View File

@ -442,7 +442,7 @@
"instructions__shares_start_with_1": "Começar com cota nº1", "instructions__shares_start_with_1": "Começar com cota nº1",
"instructions__swipe_down": "Deslizar para baixo", "instructions__swipe_down": "Deslizar para baixo",
"instructions__swipe_horizontally": "Deslizar horizontalmente", "instructions__swipe_horizontally": "Deslizar horizontalmente",
"instructions__swipe_up": "Deslizar para cima", "instructions__tap_to_continue": "Toque para continuar",
"instructions__tap_to_confirm": "Toque para confirmar", "instructions__tap_to_confirm": "Toque para confirmar",
"instructions__tap_to_start": "Toque para iniciar", "instructions__tap_to_start": "Toque para iniciar",
"joint__title": "Transação conjunta", "joint__title": "Transação conjunta",