EffectCraft: An open-source motion graphics and compositing tool written by scratch in pure Rust
Merge main into fix/browser-auto-language
Claude87a645c8bde2
diff --cc crates/ui-egui/src/i18n.rsindex 2ed342a52,611a226ee..eb92c0284--- a/crates/ui-egui/src/i18n.rs+++ b/crates/ui-egui/src/i18n.rs@@@ -110,9 -134,7 +134,10 @@@ fn supported(locale: Option<&str>) -> &"uk" => "uk","es" => "es","cs" => "cs",+ "ru" => "ru",+ "fr" => "fr",+ "de" => "de",+ "ka" => "ka",// The only Portuguese catalog: Brazil's, also for Portugal rather than English."pt" => "pt-br","zh" => {@@@ -189,6 -261,8 +264,11 @@@ pub(crate) fn entry(app: &EffectcraftAp"es" => ("Deshacer", "No se puede deshacer", "Rehacer", "No se puede rehacer"),"pt-br" => ("Desfazer", "Não há nada para desfazer", "Refazer", "Não há nada para refazer"),"cs" => ("Zpět", "Není co vrátit", "Znovu", "Není co zopakovat"),++ "ru" => ("Отменить", "Нечего отменять", "Повторить", "Нечего повторять"),++ "fr" => ("Annuler", "Impossible d'annuler", "Rétablir", "Impossible de rétablir"),++ "de" => ("Rückgängig", "Rückgängig nicht möglich", "Wiederholen", "Wiederholen nicht möglich"),+ // A colon before the history's (untranslated) action name: "დაბრუნება: Comp1".+ "ka" => ("დაბრუნება:", "დაბრუნება შეუძლებელია", "ხელახლა შესრულება:", "ხელახლა შესრულება შეუძლებელია"),_ => return shown,};match e.command.as_str() {@@@ -6910,24 -7537,6 +7543,43 @@@ mod testsapp.session.execute("prefs.set", json!({"key":"general.language", "value":"en"})).unwrap();assert_eq!(label(&app, "", "Composition"), "Composition");}++ /// Match System in the browser also picks the Russian, French and German catalogs, in the++ /// order of the browser's preferences (#1700).++ #[test]++ fn browser_preferences_choose_russian_french_and_german() {++ let tags = |t: &[&str]| t.iter().map(|s| s.to_string()).collect::<Vec<_>>();++ for (locales, expected) in++ [(vec!["de-DE", "es-ES"], "de"), (vec!["xx-XX", "fr-CA"], "fr"), (vec!["ru-RU", "cs"], "ru"), (vec!["en-US", "de-DE"], "en"), (vec!["xx-XX"], "en")]++ {++ assert_eq!(super::first_supported(None, &tags(&locales), super::web_draws), expected, "{locales:?}");++ }++ }++++ /// The Edit menu's Undo and Redo name the history's action in the interface language, also in++ /// the languages added with #1700.+ #[test]- fn browser_preferences_choose_a_supported_language_in_order() {- for (locales, fallback, expected) in [- (vec!["es-ES"], None, "es"),- (vec!["ja-JP", "es-ES"], None, "ja"),- (vec!["xx-XX", "es-MX"], None, "es"),- (vec!["en-US", "es-ES"], None, "en"),- (vec!["zh-TW"], None, "zh-hant"),- (vec!["de-DE", "es-ES"], None, "de"),- (vec![], Some("ja-JP"), "ja"),- (vec!["xx-XX"], Some("es-ES"), "es"),- (vec![], None, "en"),- (vec!["xx-XX"], Some("xx-XX"), "en"),++ fn undo_and_redo_are_localized_for_russian_french_and_german() {++ for (language, undo, no_undo, redo, no_redo) in [++ ("ru", "Отменить", "Нечего отменять", "Повторить", "Нечего повторять"),++ ("fr", "Annuler", "Impossible d'annuler", "Rétablir", "Impossible de rétablir"),++ ("de", "Rückgängig", "Rückgängig nicht möglich", "Wiederholen", "Wiederholen nicht möglich"),+ ] {- assert_eq!(browser_language(locales.into_iter(), fallback), expected);++ let mut app = EffectcraftApp::new(effectcraft_engine::Session::default());++ app.session.execute("prefs.set", json!({"key": "general.language", "value": language})).unwrap();++ let entry_of = |app: &EffectcraftApp, command: &str| {++ let (_, e) = effectcraft_engine::menus::entries().into_iter().find(|(_, e)| e.command == command).unwrap();++ entry(app, e, e.label.clone())++ };++ assert_eq!(entry_of(&app, "edit.undo"), no_undo, "{language}");++ assert_eq!(entry_of(&app, "edit.redo"), no_redo, "{language}");++ app.session.execute("comp.new", json!({"name": "A", "duration": 1})).unwrap();++ let action = app.session.history.undo.last().map(|u| u.0.clone()).unwrap();++ assert_eq!(entry_of(&app, "edit.undo"), format!("{undo} {action}"), "{language}");++ app.session.execute("edit.undo", json!({})).unwrap();++ assert_eq!(entry_of(&app, "edit.redo"), format!("{redo} {action}"), "{language}");+ }+ }+#[test]fn match_system_uses_the_system_language_where_there_is_a_catalog() {for (locale, language) in [@@@ -6957,11 -7566,12 +7609,14 @@@(Some("cs-CZ"), "cs"),(Some("cs_CZ.UTF-8"), "cs"),(Some("CS_cz.UTF-8"), "cs"),+ (Some("ka"), "ka"),+ (Some("ka-GE"), "ka"),+ (Some("ka_GE.UTF-8"), "ka"),(Some("en-US"), "en"),(Some("jv-ID"), "en"),- (Some("de-DE"), "en"),+ (Some("de-DE"), "de"),+ (Some("fr-CA"), "fr"),+ (Some("ru-RU"), "ru"),(None, "en"),] {assert_eq!(supported(locale), language, "{locale:?}");