Skip to content

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

Merge #2016: Settings: list the languages alphabetically by their own name (@nikolainyegaard)

aiongg9a9574baaaa2
diff --cc crates/engine/src/prefs.rs
index 800cff191,a6978135d..30b806683
--- a/crates/engine/src/prefs.rs
+++ b/crates/engine/src/prefs.rs
@@@ -26,17 -26,18 +26,19 @@@ pub const PREFS_FILE: &str = "prefs.jso
pub const LANGUAGES: &[(&str, &str)] = &[
("Match System", "system"),
("English", "en"),
- ("日本語", "ja"),
- ("简体中文", "zh-hans"),
- ("繁體中文", "zh-hant"),
- ("Українська", "uk"),
- // Alphabetical by the language's own name after English; Cyrillic, then CJK names follow the
- // Latin ones.
++ // Alphabetical by the language's own name after English; Cyrillic, Georgian, then CJK names
++ // follow the Latin ones.
+ ("Čeština", "cs"),
+ ("Deutsch", "de"),
("Español", "es"),
+ ("Français", "fr"),
("Português (Brasil)", "pt-br"),
("Русский", "ru"),
- ("Français", "fr"),
- ("Deutsch", "de"),
- ("Čeština", "cs"),
+ ("Українська", "uk"),
+ ("ქართული", "ka"),
+ ("日本語", "ja"),
+ ("简体中文", "zh-hans"),
+ ("繁體中文", "zh-hant"),
];
/// Settings ▸ Startup & Repair ▸ Window Graphics: (label, `startup.windowGraphics` value).
diff --cc crates/ui-egui/src/i18n.rs
index a82c595bc,ba7d73ad2..ccd3059fa
--- a/crates/ui-egui/src/i18n.rs
+++ b/crates/ui-egui/src/i18n.rs
@@@ -15,7 -13,7 +15,7 @@@ pub(crate) use ui::catalog_characters
pub(crate) use ui::{set_current, tr, tr_args};
/// Every language with a catalog, in the order Settings ▸ General ▸ Language lists them.
- const CATALOG_CODES: [&str; 11] = ["ja", "zh-hans", "zh-hant", "uk", "es", "pt-br", "ru", "fr", "de", "cs", "ka"];
-const CATALOG_CODES: [&str; 10] = ["cs", "de", "es", "fr", "pt-br", "ru", "uk", "ja", "zh-hans", "zh-hant"];
++const CATALOG_CODES: [&str; 11] = ["cs", "de", "es", "fr", "pt-br", "ru", "uk", "ka", "ja", "zh-hans", "zh-hant"];
/// The active interface language: the stored preference when it names a catalog, otherwise `en`
/// (English is the source of every label and needs no lookup).