From f48c3efb5c070ccf3eca790a8de7bde987e4de8f Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Thu, 19 Nov 2026 12:10:59 -0800 Subject: [PATCH] i18n: panel and status bar labels use the language's colon The Info panel's Shear and Zoom readouts, the status bar's Undos and Redos counts, the Appearance panel's graphic style header, the Links panel tooltip's holder and Opacity Mask lines, and Production Preflight's Effective PPI line wrote a plain ":" after a translated label. They now use i18n::colon, so French shows a no-break space before the colon and Japanese and Chinese show the full-width colon. English is unchanged. Part of #7991. --- crates/ui-egui/src/chrome/status_bar.rs | 3 ++- crates/ui-egui/src/chrome/tests.rs | 6 +++++ crates/ui-egui/src/panels/appearance.rs | 2 +- crates/ui-egui/src/panels/appearance/tests.rs | 7 ++++++ crates/ui-egui/src/panels/info.rs | 22 +++++++++++++++++-- crates/ui-egui/src/panels/links.rs | 4 ++-- crates/ui-egui/src/panels/preflight.rs | 7 +++++- crates/ui-egui/src/panels/preflight/tests.rs | 12 ++++++++++ crates/ui-egui/src/panels/tests_links.rs | 7 ++++++ 9 files changed, 63 insertions(+), 7 deletions(-) diff --git a/crates/ui-egui/src/chrome/status_bar.rs b/crates/ui-egui/src/chrome/status_bar.rs index 57b1b2a457..126cc956f3 100644 --- a/crates/ui-egui/src/chrome/status_bar.rs +++ b/crates/ui-egui/src/chrome/status_bar.rs @@ -209,7 +209,8 @@ pub(super) fn info_text(app: &VectorcraftApp) -> (String, Option) { (text, Some(next)) } StatusBarShow::Undos => { - let text = st.map(|d| format!("{}: {} {}: {}", tl!("Undos"), d.history.undo.len(), tl!("Redos"), d.history.redo.len())); + let (undos, redos) = (crate::i18n::colon(tl!("Undos")), crate::i18n::colon(tl!("Redos"))); + let text = st.map(|d| format!("{undos} {} {redos} {}", d.history.undo.len(), d.history.redo.len())); (text.unwrap_or_default(), None) } StatusBarShow::ColorProfile => (st.map(|d| color_profile_name(&d.doc)).unwrap_or_default(), None), diff --git a/crates/ui-egui/src/chrome/tests.rs b/crates/ui-egui/src/chrome/tests.rs index 5a4d92ab6d..3b889b1f09 100644 --- a/crates/ui-egui/src/chrome/tests.rs +++ b/crates/ui-egui/src/chrome/tests.rs @@ -1127,6 +1127,12 @@ fn the_status_bar_info_field_shows_the_chosen_readout() { app.run("edit.undo", json!({})).unwrap(); assert_eq!(counts(&app), format!("Undos: {before} Redos: 1")); assert!(status_after(&mut app, &ctx, 0.1, vec![]).iter().any(|t| t.text == counts(&app)), "the redo step counts"); + // The labels take the UI language's colon (#7991). + let fr = crate::i18n::Lang::from_code("fr").unwrap(); + crate::i18n::set_current(fr); + let (french, _) = super::status_bar::info_text(&app); + crate::i18n::set_current(crate::i18n::Lang::EN); + assert_eq!(french, format!("{}\u{a0}: {before} {}\u{a0}: 1", crate::i18n::tr(fr, "Undos"), crate::i18n::tr(fr, "Redos"))); app.run("view.statusBarShow", json!({"show": "colorProfile"})).unwrap(); let working = vectorcraft_color::cms::working_settings(); diff --git a/crates/ui-egui/src/panels/appearance.rs b/crates/ui-egui/src/panels/appearance.rs index 8b479c3256..16b0f1f7f2 100644 --- a/crates/ui-egui/src/panels/appearance.rs +++ b/crates/ui-egui/src/panels/appearance.rs @@ -488,7 +488,7 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) { _ => None, }; let label = match style { - Some(name) => std::borrow::Cow::Owned(format!("{label}: {name}")), + Some(name) => std::borrow::Cow::Owned(format!("{} {name}", crate::i18n::colon(label))), None => std::borrow::Cow::Borrowed(label), }; if !hide_thumb { diff --git a/crates/ui-egui/src/panels/appearance/tests.rs b/crates/ui-egui/src/panels/appearance/tests.rs index 67bea32636..4816d0838d 100644 --- a/crates/ui-egui/src/panels/appearance/tests.rs +++ b/crates/ui-egui/src/panels/appearance/tests.rs @@ -915,6 +915,13 @@ fn with_nothing_selected_it_lists_what_new_art_gets() { for want in ["No Selection: Fancy".to_string(), effect_label("stylize.dropShadow"), "Opacity: 50%".into(), "Dashed".into()] { assert!(shown.contains(&want), "{want} in {shown:?}"); } + // The style name follows the UI language's colon (#7991). + let fr = crate::i18n::Lang::from_code("fr").unwrap(); + crate::i18n::set_current(fr); + let shown = frame(&mut app); + crate::i18n::set_current(crate::i18n::Lang::EN); + let want = format!("{}\u{a0}: Fancy", crate::i18n::tr(fr, "No Selection")); + assert!(shown.contains(&want), "{want} in {shown:?}"); } /// Both stroke rows expose named Weight inputs, and the drop-shadow effect names its Blur input and diff --git a/crates/ui-egui/src/panels/info.rs b/crates/ui-egui/src/panels/info.rs index 19fe505c0c..753a4cc20b 100644 --- a/crates/ui-egui/src/panels/info.rs +++ b/crates/ui-egui/src/panels/info.rs @@ -111,7 +111,9 @@ impl Rows { } Some(Readout::Scale { sx, sy }) => rows.right = vec![format!("W: {:.1}%", sx * 100.0), format!("H: {:.1}%", sy * 100.0)], Some(Readout::Rotate { angle, .. } | Readout::Reflect { angle, .. }) => rows.right = vec![format!("A: {angle:.1}°")], - Some(Readout::Shear { axis, angle, .. }) => rows.right = vec![format!("A: {axis:.1}°"), format!("{}: {angle:.1}°", tl!("Shear"))], + Some(Readout::Shear { axis, angle, .. }) => { + rows.right = vec![format!("A: {axis:.1}°"), format!("{} {angle:.1}°", crate::i18n::colon(tl!("Shear")))] + } Some(Readout::Brush { .. }) | None => { let (w, h) = s.size.map(|(w, h, _)| (len(w), len(h))).unwrap_or_default(); rows.right = vec![format!("W: {w}"), format!("H: {h}")]; @@ -177,7 +179,7 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) { }); if app.session.tool_id() == "zoom" { let zoom = app.view().map_or(1.0, |v| v.zoom); - mono(ui, format!("{}: {}", tl!("Zoom"), crate::state::zoom_label(zoom, app.session.prefs.display_print_size))); + mono(ui, format!("{} {}", crate::i18n::colon(tl!("Zoom")), crate::state::zoom_label(zoom, app.session.prefs.display_print_size))); } if let Some(Readout::Brush { name: Some(name) }) = readout { mono(ui, name); @@ -317,6 +319,22 @@ mod tests { assert!(texts(&mut app).contains(&want), "{want}: {:?}", texts(&mut app)); } + /// The Shear and Zoom readouts write their colon as the UI language does (#7991). + #[test] + fn readout_labels_use_the_language_colon() { + let mut app = app_with_rect(); + app.session.select_tool("zoom", view()).unwrap(); + let fr = crate::i18n::Lang::from_code("fr").unwrap(); + crate::i18n::set_current(fr); + let shear = shown(Some(&Readout::Shear { center: Point::new(60.0, 70.0), axis: 90.0, angle: -12.5 }), true); + let shown_texts = texts(&mut app); + crate::i18n::set_current(crate::i18n::Lang::EN); + assert_eq!(shear.right[1], format!("{}\u{a0}: -12.5°", crate::i18n::tr(fr, "Shear"))); + let zoom = app.view().map_or(1.0, |v| v.zoom); + let want = format!("{}\u{a0}: {}", crate::i18n::tr(fr, "Zoom"), crate::state::zoom_label(zoom, app.session.prefs.display_print_size)); + assert!(shown_texts.contains(&want), "{want}: {shown_texts:?}"); + } + #[test] fn the_paintbrush_shows_its_brush() { let mut app = app_with_rect(); diff --git a/crates/ui-egui/src/panels/links.rs b/crates/ui-egui/src/panels/links.rs index b631596535..4c491efb6b 100644 --- a/crates/ui-egui/src/panels/links.rs +++ b/crates/ui-egui/src/panels/links.rs @@ -519,11 +519,11 @@ pub(super) fn status_tip(r: &Value, mask: Option) -> String { _ => None, }; let tip = match art { - Some(kind) => format!("{tip}\n{kind}: {name}"), + Some(kind) => format!("{tip}\n{} {name}", crate::i18n::colon(kind)), None => tip, }; match owner["maskOf"].as_u64() { - Some(id) => format!("{tip}\n{}: {}", tl!("Opacity Mask"), mask.unwrap_or_else(|| id.to_string())), + Some(id) => format!("{tip}\n{} {}", crate::i18n::colon(tl!("Opacity Mask")), mask.unwrap_or_else(|| id.to_string())), None => tip, } } diff --git a/crates/ui-egui/src/panels/preflight.rs b/crates/ui-egui/src/panels/preflight.rs index 0be4c4296b..ff8b9214d7 100644 --- a/crates/ui-egui/src/panels/preflight.rs +++ b/crates/ui-egui/src/panels/preflight.rs @@ -187,7 +187,7 @@ fn results(app: &mut VectorcraftApp, ui: &mut Ui, report: &Value) { } if let Some(ppi) = finding["effectivePpi"].as_array() { let values = ppi.iter().filter_map(Value::as_f64).map(|n| format!("{n:.0}")).collect::>(); - dim_label(ui, &format!("{}: {} ppi", tl!("Effective PPI"), values.join(" × "))); + dim_label(ui, &effective_ppi_line(&values)); } let source = finding["sourceId"].as_u64(); if code == "missingLink" @@ -220,5 +220,10 @@ fn results(app: &mut VectorcraftApp, ui: &mut Ui, report: &Value) { dim_label(ui, tl!("These checks do not certify an exported file.")); } +/// A low-resolution finding's effective resolution, one value per axis. +fn effective_ppi_line(values: &[String]) -> String { + format!("{} {} ppi", crate::i18n::colon(tl!("Effective PPI")), values.join(" × ")) +} + #[cfg(test)] mod tests; diff --git a/crates/ui-egui/src/panels/preflight/tests.rs b/crates/ui-egui/src/panels/preflight/tests.rs index 448a114bbf..0b6d2bf509 100644 --- a/crates/ui-egui/src/panels/preflight/tests.rs +++ b/crates/ui-egui/src/panels/preflight/tests.rs @@ -153,6 +153,18 @@ fn preflight_panel_rechecks_missing_files_on_its_timer_and_on_request() { std::fs::remove_file(&path).unwrap(); } +/// The Effective PPI line writes its colon as the UI language does (#7991). +#[test] +fn effective_ppi_uses_the_language_colon() { + let values = ["150".to_string(), "300".to_string()]; + let fr = crate::i18n::Lang::from_code("fr").unwrap(); + crate::i18n::set_current(fr); + let french = effective_ppi_line(&values); + crate::i18n::set_current(crate::i18n::Lang::EN); + assert_eq!(french, format!("{}\u{a0}: 150 × 300 ppi", crate::i18n::tr(fr, "Effective PPI"))); + assert_eq!(effective_ppi_line(&values), "Effective PPI: 150 × 300 ppi"); +} + /// An optional visual QA artifact, never a checked-in snapshot or an asset shipped by the app. #[test] #[ignore = "set PREFLIGHT_PREVIEW_PATH to write an offscreen GPU render for visual review"] diff --git a/crates/ui-egui/src/panels/tests_links.rs b/crates/ui-egui/src/panels/tests_links.rs index b0be98c21e..85a26e557a 100644 --- a/crates/ui-egui/src/panels/tests_links.rs +++ b/crates/ui-egui/src/panels/tests_links.rs @@ -458,6 +458,13 @@ fn a_nested_rows_tooltip_names_what_holds_it() { // A row in the layers says only its file. let row = json!({"id": 9, "name": "a.png", "status": "ok", "path": "/x/a.png"}); assert_eq!(super::links::status_tip(&row, None), "/x/a.png"); + // The labels take the UI language's colon (#7991). + let fr = crate::i18n::Lang::from_code("fr").unwrap(); + crate::i18n::set_current(fr); + let french = tip(json!({"kind": "symbol", "name": "Mark", "maskOf": 7}), None); + crate::i18n::set_current(crate::i18n::Lang::EN); + let (symbols, mask) = (crate::i18n::tr(fr, "Symbols"), crate::i18n::tr(fr, "Opacity Mask")); + assert_eq!(french, format!("/x/a.png\n{symbols}\u{a0}: Mark\n{mask}\u{a0}: 7")); } /// The tooltip of an image in the opacity mask of an object inside a symbol names that object,