Skip to content

EffectCraft: An open-source motion graphics and compositing tool written by scratch in pure Rust

Merge main into #1784; main already maps ru/fr/de and has Russian undo/redo: keep main's supported() and history table, add only the French and German undo/redo wording, test Russian with main's colon form

bflatasticdfa5d9eeeadd
diff --cc crates/ui-egui/src/i18n.rs
index eb92c0284,254eec49c..0c55fed6d
--- a/crates/ui-egui/src/i18n.rs
+++ b/crates/ui-egui/src/i18n.rs
@@@ -255,25 -255,32 +255,34 @@@ pub(crate) fn entry(app: &EffectcraftAp
return effects::name(id, &e.label);
}
// Undo/redo names come from the history, so they are formatted per language here rather than
- // looked up in a catalog. An English (or untranslated) interface keeps the shown label.
- let (undo, no_undo, redo, no_redo) = match language(app) {
- "ja" => ("取り消し", "取り消しできません", "やり直し", "やり直しできません"),
- "zh-hans" => ("撤销", "无可撤销的操作", "重做", "无可重做的操作"),
- "zh-hant" => ("復原", "沒有可復原的操作", "重做", "沒有可重做的操作"),
- "uk" => ("Скасувати", "Немає дій для скасування", "Повторити", "Немає дій для повторення"),
- "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"),
+ // looked up in a catalog. A language without this wording keeps the shown undo/redo label, and
+ // the rest of its menu still goes through the catalog below (#1449).
+ let history = match language(app) {
+ "en" => return shown,
+ "ja" => Some(("取り消し", "取り消しできません", "やり直し", "やり直しできません")),
+ "zh-hans" => Some(("撤销", "无可撤销的操作", "重做", "无可重做的操作")),
+ "zh-hant" => Some(("復原", "沒有可復原的操作", "重做", "沒有可重做的操作")),
+ "uk" => Some(("Скасувати", "Немає дій для скасування", "Повторити", "Немає дій для повторення")),
+ "es" => Some(("Deshacer", "No se puede deshacer", "Rehacer", "No se puede rehacer")),
+ "pt-br" => Some(("Desfazer", "Não há nada para desfazer", "Refazer", "Não há nada para refazer")),
+ "cs" => Some(("Zpět", "Není co vrátit", "Znovu", "Není co zopakovat")),
++ "fr" => Some(("Annuler", "Impossible d'annuler", "Rétablir", "Impossible de rétablir")),
++ "de" => Some(("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,
+ "ka" => Some(("დაბრუნება:", "დაბრუნება შეუძლებელია", "ხელახლა შესრულება:", "ხელახლა შესრულება შეუძლებელია")),
+ // A colon before the history's (untranslated) action name: "Отменить: Comp1".
+ "ru" => Some(("Отменить:", "Нечего отменять", "Повторить:", "Нечего повторять")),
+ _ => None,
};
match e.command.as_str() {
- "edit.undo" => app.session.history.undo.last().map(|u| format!("{undo} {}", u.0)).unwrap_or_else(|| no_undo.into()),
- "edit.redo" => app.session.history.redo.last().map(|u| format!("{redo} {}", u.0)).unwrap_or_else(|| no_redo.into()),
+ "edit.undo" | "edit.redo" => {
+ let Some((undo, no_undo, redo, no_redo)) = history else { return shown };
+ if e.command == "edit.undo" {
+ app.session.history.undo.last().map(|u| format!("{undo} {}", u.0)).unwrap_or_else(|| no_undo.into())
+ } else {
+ app.session.history.redo.last().map(|u| format!("{redo} {}", u.0)).unwrap_or_else(|| no_redo.into())
+ }
+ }
"window.panel" => {
let prefix = format!("{}: ", e.label);
if let Some(name) = shown.strip_prefix(&prefix) {
@@@ -7543,43 -7550,6 +7552,43 @@@ mod tests
app.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 undo_and_redo_are_localized_for_russian_french_and_german() {
+ for (language, undo, no_undo, redo, no_redo) in [
- ("ru", "Отменить", "Нечего отменять", "Повторить", "Нечего повторять"),
++ ("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"),
+ ] {
+ 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 [