LightCraft: An open-source non-destructive photo editor written by scratch in pure Rust
Merge PR #2449: Settings and Edit ▸ Language: list the languages alphabetically by their own name
aionggf460cbd90caf
diff --cc crates/ui-egui/src/i18n.rsindex e9196ae79,9a7f3ebd4..158a00664--- a/crates/ui-egui/src/i18n.rs+++ b/crates/ui-egui/src/i18n.rs@@@ -130,12 -130,41 +130,45 @@@ language_table!Cs, "cs", "Čeština", "Latn", include_str!("../locales/cs.json");It, "it", "Italiano", "Latn", include_str!("../locales/it.json");Ka, "ka", "ქართული", "Geor", include_str!("../locales/ka.json");+ Sv, "sv", "Svenska", "Latn", include_str!("../locales/sv.json");+ Fi, "fi", "Suomi", "Latn", include_str!("../locales/fi.json");+ Id, "id", "Bahasa Indonesia", "Latn", include_str!("../locales/id.json");+ Vi, "vi", "Tiếng Việt", "Latn", include_str!("../locales/vi.json");}+ impl Locale {+ /// Every language in the order the Settings row and Edit ▸ Language list them: English first+ /// (the source language), then the rest by their own name with accents folded, so Čeština+ /// sits under C. Names in other scripts follow the Latin ones in code point order: Cyrillic,+ /// Georgian, then the CJK languages.+ pub fn for_picker() -> Vec<Self> {+ let mut rest: Vec<Self> = Self::ALL.iter().copied().filter(|l| *l != Self::En).collect();+ rest.sort_by_cached_key(|l| name_sort_key(l.name()));+ std::iter::once(Self::En).chain(rest).collect()+ }+ }++ /// `name` lowercased with the Latin accents that occur in language names folded away, so a+ /// byte-wise sort reads alphabetically. Other scripts are left as they are.+ fn name_sort_key(name: &str) -> String {+ name.chars()+ .flat_map(char::to_lowercase)+ .map(|c| match c {+ 'à'..='å' | 'ā' | 'ă' | 'ą' => 'a',+ 'ç' | 'ć' | 'č' => 'c',+ 'è'..='ë' | 'ē' | 'ě' | 'ę' | 'ế' | 'ệ' => 'e',+ 'ì'..='ï' | 'ī' => 'i',+ 'ñ' | 'ń' | 'ň' => 'n',+ 'ò'..='ö' | 'ø' | 'ő' => 'o',+ 'ś' | 'š' => 's',+ 'ù'..='ü' | 'ū' | 'ů' | 'ű' => 'u',+ 'ý' | 'ÿ' => 'y',+ 'ź' | 'ż' | 'ž' => 'z',+ c => c,+ })+ .collect()+ }+// The settings file stores the BCP-47 code (`"zh-hans"`), never the Rust variant name, so a// language can be renamed in code without invalidating anyone's settings.impl Serialize for Locale {@@@ -1830,188 -1633,26 +1863,210 @@@ mod testsassert_eq!(history_label("Preset: Warm Glow", &app.session.presets), "預設集:Warm Glow");set_language(Locale::En);}++ /// English catalog values Vietnamese keeps on purpose. Grouped by reason:+ /// standards/acronyms (`ISO`, `HDR`, …), product names (`LightCraft`, `PhotoCraft`),+ /// file-type tokens (`Raw`/`raw`, `video`), look names left as established labels+ /// (`Bleach Bypass`, `Vintage`), and machine ids that must stay byte-identical+ /// (`publicDomain`, `denoiseModel.accept`). `Album` stays as the common loanword.+ /// Every other required label must differ from its English source.+ const VI_INTENTIONAL_ENGLISH: &[&str] = &[+ "OK",+ "ISO",+ "RGB",+ "HDR",+ "JPEG",+ "PNG",+ "TIFF",+ "WebP",+ "AVIF",+ "HEIF",+ "HEIC",+ "DNG",+ "ICC",+ "EXIF",+ "XMP",+ "GPU",+ "MCP",+ "SAM",+ "RAW",+ "Raw",+ "raw",+ "B&W",+ "LUT",+ "LightCraft",+ "ArtCraft",+ "GitHub",+ "Discord",+ "English",+ "日本語",+ "繁體中文(台灣)",+ "Display P3",+ "Bleach Bypass",+ "Cross Process",+ "HDR…",+ "video",+ "Video",+ "true",+ "false",+ "Album",+ "Vintage",+ "publicDomain",+ "denoiseModel.accept",+ "Panorama",+ "Panorama…",+ "PhotoCraft",+ "SDR",+ "Matrix/TRC",+ "LUT-based",+ ];++ /// Vietnamese's coverage of every catalog message and display label, reported like Italian's; the+ /// messages it has are never left in English.+ #[test]+ fn vietnamese_covers_catalogs_commands_controls_and_rules() {+ let catalog = Locale::Vi.catalog();+ assert!(!catalog.is_empty());+ let keys: std::collections::BTreeSet<&String> = Locale::ALL.iter().flat_map(|language| language.catalog().keys()).collect();+ let lacking: Vec<_> = keys.into_iter().filter(|key| !catalog.contains_key(key.as_str())).collect();+ if !lacking.is_empty() {+ eprintln!("vi lacks {} catalog message(s) (shown in English): {lacking:?}", lacking.len());+ }++ let mut labels: Vec<&str> = lightcraft_engine::command_specs().iter().map(|spec| spec.label).collect();+ labels.extend(crate::menus::ui_commands().map(|command| command.1).filter(|label| !Locale::ALL.iter().any(|locale| locale.name() == *label)));+ labels.extend(lightcraft_develop::CONTROLS.iter().map(|control| control.label));+ labels.extend(crate::panels::settings::TABS.iter().map(|(_, label)| *label));+ for (_, label, kind) in lightcraft_catalog::rules::FIELDS {+ labels.push(label);+ labels.extend(lightcraft_catalog::rules::ops_for(*kind).iter().map(|(_, label)| *label));+ }+ labels.extend(lightcraft_catalog::rules::FIELD_GROUPS.iter().map(|group| group.0));+ labels.extend(lightcraft_engine::rename::TOKENS.iter().map(|token| token.meaning));+ labels.extend(lightcraft_engine::rename::TEMPLATE_NOTES);+ for word in crate::date_picker::WEEKDAY_SHORT.iter().chain(&["Pick a date", "Year", "Month", "Day"]) {+ labels.push(*word);+ }+ for day in ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"] {+ labels.push(day);+ }+ let missing: Vec<_> = labels.into_iter().filter(|label| !catalog.contains_key(*label)).collect();+ if !missing.is_empty() {+ eprintln!("vi lacks {} display label(s) (shown in English): {missing:?}", missing.len());+ }++ for (key, value) in catalog {+ if key.contains('|') {+ continue;+ }+ if VI_INTENTIONAL_ENGLISH.contains(&key.as_str()) {+ continue;+ }+ assert!(!value.is_empty(), "vi empty for {key:?}");+ // Identical values outside the allowlist are accidental English fallbacks.+ if value == key && key.chars().any(|ch| ch.is_ascii_alphabetic()) && key.len() > 1 {+ // Single-letter ops / symbols may match; longer shared English must be listed.+ assert!(+ key.len() <= 2 || key.chars().all(|ch| !ch.is_ascii_alphabetic()),+ "vi keeps English for {key:?}; add it to VI_INTENTIONAL_ENGLISH if intentional"+ );+ }+ }+ }++ #[test]+ fn vietnamese_switches_persists_formats_dates_and_preserves_values() {+ use crate::control::{ControlRequest, Outcome};+ let mut app = crate::LightcraftApp::new(lightcraft_engine::Session::with_demo(), Default::default());+ app.run("app.language.vietnamese", serde_json::json!({})).unwrap();+ assert_eq!(app.ui.language, Locale::Vi);+ assert_eq!(crate::menubar::checked(&app, "app.language.vietnamese"), Some(true));+ assert_eq!(tr("Light"), "Ánh sáng");+ assert_eq!(tr("Exposure"), "Phơi sáng");+ assert_eq!(Locale::Vi.name(), "Tiếng Việt");+ assert_eq!(tr("Settings"), "Cài đặt");+ assert_eq!(tr("Appearance"), "Giao diện");+ assert_eq!(tr("My Photos"), "Ảnh của tôi");+ assert_eq!(tr("Candidate"), "Ảnh ứng viên");+ assert_eq!(tr("Subject"), "Chủ thể");+ assert_eq!(date_group_label("2026-09-20", false), "Chủ Nhật, 20/9/2026");+ assert_eq!(date_group_label("2026-09", false), "Tháng 9 năm 2026");+ assert_eq!(date_group_label("2026-09", true), "Tháng 9");+ assert_eq!(display_time("2026-09-20T16:04:05"), "Chủ Nhật, 20/9/2026 16:04:05");+ for n in [0, 1, 2, 5, 22] {+ let text = tr_format!("Imported {} photo{}", n, if n == 1 { "" } else { "s" });+ assert!(text.contains(&n.to_string()) && text.contains("ảnh"), "{n}: {text}");+ assert!(!text.contains("photos") && !text.contains("photo"), "{n}: {text}");+ }+ let name = "Color {title} 日本語";+ assert_eq!(tr_format!("Added {n} photo{} to “{}”", "s", name, n = 22), format!("Đã thêm 22 ảnh vào «{name}»"));+ assert_eq!(builtin_label("Warm Glow", false), "Warm Glow");+ assert_ne!(builtin_label("Warm Glow", true), "Warm Glow");+ assert_eq!(tr("photo-{title}.jpg"), "photo-{title}.jpg");+ assert_eq!(tr("develop.set"), "develop.set");+ let saved = serde_json::to_string(&app.ui).unwrap();+ assert!(saved.contains(r#""language":"vi""#), "{saved}");+ assert_eq!(serde_json::from_str::<crate::state::UiState>(&saved).unwrap().language, Locale::Vi);+ let ctx = egui::Context::default();+ for code in ["vi", "vi-VN", "vi_VN", "vi_VN.UTF-8"] {+ assert_eq!(Locale::parse_tag(code), Some(Locale::Vi));+ let (request, _) = ControlRequest::new("ui.set", serde_json::json!({"language": code}));+ let Outcome::Done(reply) = crate::control::handle(&mut app, &ctx, &request) else { panic!("expected reply") };+ assert_eq!(reply["ok"], true);+ assert_eq!(language(), Locale::Vi);+ }+ set_language(Locale::En);+ }++ #[test]+ fn vietnamese_panels_dialogs_and_diacritics_paint_with_bundled_fonts() {+ let ctx = fonts_ctx(&[]);+ let mut app = crate::LightcraftApp::new(lightcraft_engine::Session::with_demo(), Default::default());+ app.ui.left_panel = true;+ let text = painted_text(&ctx, &mut app, Locale::Vi);+ assert!(text.contains("Ảnh của tôi") && text.contains("Tất cả ảnh"), "{text}");+ for (command, title) in [("app.about", "Giới thiệu LightCraft"), ("app.shortcuts", "Phím tắt"), ("app.settings", "Cài đặt")] {+ app.ui.dialog = None;+ app.run(command, serde_json::json!({})).unwrap();+ let text = painted_text(&ctx, &mut app, Locale::Vi);+ assert!(text.contains(title), "{command}: {text}");+ }+ ctx.fonts_mut(|fonts| {+ for family in [egui::FontFamily::Proportional, egui::FontFamily::Name(crate::theme::FONT_SEMIBOLD.into())] {+ let font = egui::FontId::new(13.0, family);+ for ch in "ĂăÂâÊêÔôƠơƯưĐđáàảãạéèẻẽẹíìỉĩịóòỏõọúùủũụýỳỷỹỵ".chars().chain(+ Locale::Vi+ .catalog()+ .values()+ .flat_map(|text| text.chars())+ .filter(|ch| ('\u{00c0}'..='\u{024f}').contains(ch) || ('\u{1ea0}'..='\u{1ef9}').contains(ch)),+ ) {+ assert!(fonts.has_glyph(&font, ch), "missing Vietnamese glyph {ch}");+ }+ }+ });+ set_language(Locale::En);+ }}++ #[cfg(test)]+ mod picker_order_tests {+ use super::*;++ #[test]+ fn picker_lists_english_first_then_names_alphabetically() {+ let order = Locale::for_picker();+ assert_eq!(order.first(), Some(&Locale::En));+ assert_eq!(order.len(), Locale::ALL.len());+ let keys: Vec<String> = order[1..].iter().map(|l| name_sort_key(l.name())).collect();+ assert!(keys.windows(2).all(|w| w[0] <= w[1]), "{keys:?}");+ assert_eq!(name_sort_key("Čeština"), "cestina");+ }++ #[test]+ fn language_menu_lists_the_picker_order() {+ let menu: Vec<&str> = crate::menus::LANGUAGE_COMMANDS.iter().map(|c| c.1).collect();+ let picker: Vec<&str> = Locale::for_picker().into_iter().map(Locale::name).collect();+ assert_eq!(menu, picker, "Edit ▸ Language and the Settings row list the languages the same way");+ }+ }diff --cc crates/ui-egui/src/menus.rsindex 74b029eef,704231d6b..4bf197051--- a/crates/ui-egui/src/menus.rs+++ b/crates/ui-egui/src/menus.rs@@@ -15,23 -15,21 +15,25 @@@ pub type UiCommand = (&'static str, &'s/// has a matching menu command (also listed through the control channel). Tests check coverage.pub const LANGUAGE_COMMANDS: &[UiCommand] = &[("app.language.english", crate::i18n::Locale::En.name(), None, "Edit>Language"),- ("app.language.simplifiedChinese", crate::i18n::Locale::ZhHans.name(), None, "Edit>Language"),- ("app.language.traditionalChinese", crate::i18n::Locale::ZhHant.name(), None, "Edit>Language"),- ("app.language.japanese", crate::i18n::Locale::Ja.name(), None, "Edit>Language"),- ("app.language.portuguese", crate::i18n::Locale::PtBr.name(), None, "Edit>Language"),- ("app.language.french", crate::i18n::Locale::Fr.name(), None, "Edit>Language"),- ("app.language.spanish", crate::i18n::Locale::Es.name(), None, "Edit>Language"),- ("app.language.german", crate::i18n::Locale::De.name(), None, "Edit>Language"),- ("app.language.russian", crate::i18n::Locale::Ru.name(), None, "Edit>Language"),- ("app.language.ukrainian", crate::i18n::Locale::Uk.name(), None, "Edit>Language"),- ("app.language.polish", crate::i18n::Locale::Pl.name(), None, "Edit>Language"),+ // The picker order (`Locale::for_picker`): alphabetical by the language's own name after+ // English; Cyrillic, Georgian, then CJK names follow the Latin ones. A test keeps them equal.++ ("app.language.indonesian", crate::i18n::Locale::Id.name(), None, "Edit>Language"),("app.language.czech", crate::i18n::Locale::Cs.name(), None, "Edit>Language"),+ ("app.language.german", crate::i18n::Locale::De.name(), None, "Edit>Language"),+ ("app.language.spanish", crate::i18n::Locale::Es.name(), None, "Edit>Language"),+ ("app.language.french", crate::i18n::Locale::Fr.name(), None, "Edit>Language"),("app.language.italian", crate::i18n::Locale::It.name(), None, "Edit>Language"),- ("app.language.georgian", crate::i18n::Locale::Ka.name(), None, "Edit>Language"),- ("app.language.swedish", crate::i18n::Locale::Sv.name(), None, "Edit>Language"),+ ("app.language.polish", crate::i18n::Locale::Pl.name(), None, "Edit>Language"),+ ("app.language.portuguese", crate::i18n::Locale::PtBr.name(), None, "Edit>Language"),+ ("app.language.finnish", crate::i18n::Locale::Fi.name(), None, "Edit>Language"),- ("app.language.indonesian", crate::i18n::Locale::Id.name(), None, "Edit>Language"),++ ("app.language.swedish", crate::i18n::Locale::Sv.name(), None, "Edit>Language"),+ ("app.language.vietnamese", crate::i18n::Locale::Vi.name(), None, "Edit>Language"),+ ("app.language.russian", crate::i18n::Locale::Ru.name(), None, "Edit>Language"),+ ("app.language.ukrainian", crate::i18n::Locale::Uk.name(), None, "Edit>Language"),+ ("app.language.georgian", crate::i18n::Locale::Ka.name(), None, "Edit>Language"),+ ("app.language.japanese", crate::i18n::Locale::Ja.name(), None, "Edit>Language"),+ ("app.language.simplifiedChinese", crate::i18n::Locale::ZhHans.name(), None, "Edit>Language"),+ ("app.language.traditionalChinese", crate::i18n::Locale::ZhHant.name(), None, "Edit>Language"),];/// Every UI command: the languages, then everything else. `xtask parity` reads both tables from