Open source Loom alternative. Beautiful, shareable screen recordings.
Rust appcapcossloommacnextjsnextjs15open-sourceossreactrecordrustscreen-capturescreen-recorderscreenshotsolidjstauritauri-apptypescriptvite
fix(desktop-gpui): keep release builds English until the language picker is enabled
Richie McIlroyc9a54c7371c9
diff --git a/apps/desktop-gpui/src/i18n/mod.rs b/apps/desktop-gpui/src/i18n/mod.rsindex 77340d665..4b9926570 100644--- a/apps/desktop-gpui/src/i18n/mod.rs+++ b/apps/desktop-gpui/src/i18n/mod.rs@@ -79,9 +79,20 @@ pub fn resolve(preference: Preference) -> Locale {{return locale;}+ resolve_preference(preference, picker_enabled(), system)+}++/// Without the picker a release build stays English on a non-English system,+/// so nobody gets a half-translated app they can't switch back from.+fn resolve_preference(+ preference: Preference,+ picker_enabled: bool,+ system: impl FnOnce() -> Locale,+) -> Locale {match preference {Preference::Fixed(locale) => locale,- Preference::System => system(),+ Preference::System if picker_enabled => system(),+ Preference::System => Locale::En,}}diff --git a/apps/desktop-gpui/src/i18n/tests.rs b/apps/desktop-gpui/src/i18n/tests.rsindex 5a8f73a9c..693f33b62 100644--- a/apps/desktop-gpui/src/i18n/tests.rs+++ b/apps/desktop-gpui/src/i18n/tests.rs@@ -511,6 +511,26 @@ fn traditional_chinese_falls_through_to_the_next_language() {assert_eq!(first_supported(Vec::new()), Locale::En);}+#[test]+fn system_language_waits_for_the_picker() {+ assert_eq!(+ resolve_preference(Preference::System, false, || Locale::Ja),+ Locale::En+ );+ assert_eq!(+ resolve_preference(Preference::System, true, || Locale::Ja),+ Locale::Ja+ );+ assert_eq!(+ resolve_preference(Preference::Fixed(Locale::De), false, || Locale::Ja),+ Locale::De+ );+ assert_eq!(+ resolve_preference(Preference::Fixed(Locale::De), true, || Locale::Ja),+ Locale::De+ );+}+#[test]fn stored_preferences_round_trip_and_unknown_values_follow_the_system() {assert_eq!(Preference::from_setting(None), Preference::System);