arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-06-26 09:52:34 +00:00
Code Issues Releases Wiki Activity

refactor(core): fn plural_form will never panic

Browse Source 
- also minor adjustment where the function is used in Eckahrt
This commit is contained in:
obrusvit 2025-05-25 19:18:29 +02:00 committed by Vít Obrusník
parent 10e88c870e
commit 0f695b55a9
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
core/embed/rust/src/strutil.rs
View File

@ -82,20 +82,22 @@ pub fn format_pairing_code(code: u32, width: usize) -> ShortString {
/// * `count` - The numeric count to select the correct plural form. /// * `count` - The numeric count to select the correct plural form.
/// ///
/// # Returns /// # Returns
/// A `ShortString` containing the correct plural form. /// A `ShortString` containing the correct plural form, or an empty
/// /// `ShortString` if the template is malformed or conversion fails.
/// # Panics
/// Panics if:
/// - The `template` has fewer than two forms.
/// - Conversion to `ShortString` fails (via `unwrap!`).
pub fn plural_form(template: &str, count: u32) -> ShortString { pub fn plural_form(template: &str, count: u32) -> ShortString {
// If no separator found, return the whole template (fallback behavior)
if !template.contains('|') {
return ShortString::try_from(template).unwrap_or_default();
}
// Split the template by '|' into components // Split the template by '|' into components
let mut parts = template.split('|'); let mut parts = template.split('|');
// First form (singular), must exist // Get the required first two parts
let first = unwrap!(parts.next().ok_or(())); let (first, second) = match (parts.next(), parts.next()) {
// Second form (plural or few), must exist (Some(first), Some(second)) => (first, second),
let second = unwrap!(parts.next().ok_or(())); _ => return ShortString::default(),
};
// Third form (many), optional // Third form (many), optional
let third = parts.next(); let third = parts.next();
@ -121,8 +123,8 @@ pub fn plural_form(template: &str, count: u32) -> ShortString {
} }
}; };
// Convert the selected form into ShortString, panicking if it fails // Convert safely, returning empty string on failure
unwrap!(ShortString::try_from(selected)) ShortString::try_from(selected).unwrap_or_default()
} }
#[derive(Copy, Clone)] #[derive(Copy, Clone)]
@ -334,8 +336,12 @@ mod tests {
#[test] #[test]
fn test_plural_form() { fn test_plural_form() {
use super::plural_form; use super::plural_form;
// malformed templete, returns empty string
assert_eq!(plural_form("day", 1).as_str(), "day");
// simple singular/plural
assert_eq!(plural_form("day|days", 1).as_str(), "day"); assert_eq!(plural_form("day|days", 1).as_str(), "day");
assert_eq!(plural_form("day|days", 3).as_str(), "days"); assert_eq!(plural_form("day|days", 3).as_str(), "days");
// Czech-style singular/few/many
assert_eq!(plural_form("den|dny|dní", 1).as_str(), "den"); assert_eq!(plural_form("den|dny|dní", 1).as_str(), "den");
assert_eq!(plural_form("den|dny|dní", 3).as_str(), "dny"); assert_eq!(plural_form("den|dny|dní", 3).as_str(), "dny");
assert_eq!(plural_form("den|dny|dní", 5).as_str(), "dní"); assert_eq!(plural_form("den|dny|dní", 5).as_str(), "dní");

8
core/embed/rust/src/ui/layout_eckhart/firmware/value_input_screen.rs
View File

@ -479,6 +479,7 @@ impl ValueInput for DurationInput {
(self.duration.to_days(), TR::plurals__lock_after_x_days), (self.duration.to_days(), TR::plurals__lock_after_x_days),
(self.duration.to_hours(), TR::plurals__lock_after_x_hours), (self.duration.to_hours(), TR::plurals__lock_after_x_hours),
(self.duration.to_mins(), TR::plurals__lock_after_x_minutes), (self.duration.to_mins(), TR::plurals__lock_after_x_minutes),
(self.duration.to_secs(), TR::plurals__lock_after_x_seconds),
]; ];
for &(count, tr) in &units { for &(count, tr) in &units {
@ -489,11 +490,8 @@ impl ValueInput for DurationInput {
} }
} }
// Fallback to seconds if all are 0 // This should never be reached unless duration is exactly 0
let count = self.duration.to_secs(); (0, None)
let plural = TString::from_translation(TR::plurals__lock_after_x_seconds)
.map(|template| plural_form(template, count));
(count, Some(plural))
} }
fn increment(&mut self) { fn increment(&mut self) {