matrix/authentication-service
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-authentication-service.git synced 2025-08-09 04:22:45 +03:00
Code Activity

i18n: make the message translator fallback to en

Browse Source
This commit is contained in:
Quentin Gliech
2024-02-01 18:07:03 +01:00
parent 36ebbc4d70
commit 3df600b5d7
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
crates/i18n/src/translator.rs
View File

@@ -50,6 +50,7 @@ pub struct Translator {
plural_provider: LocaleFallbackProvider<icu_plurals::provider::Baked>, plural_provider: LocaleFallbackProvider<icu_plurals::provider::Baked>,
list_provider: LocaleFallbackProvider<icu_list::provider::Baked>, list_provider: LocaleFallbackProvider<icu_list::provider::Baked>,
fallbacker: LocaleFallbacker, fallbacker: LocaleFallbacker,
default_locale: DataLocale,
} }
impl Translator { impl Translator {
@@ -71,6 +72,8 @@ impl Translator {
plural_provider, plural_provider,
list_provider, list_provider,
fallbacker, fallbacker,
// TODO: make this configurable
default_locale: icu_locid::locale!("en").into(),
} }
} }
@@ -135,9 +138,10 @@ impl Translator {
return Some((message, iter.take())); return Some((message, iter.take()));
} }
// Stop if we hit the `und` locale // Try the defaut locale if we hit the `und` locale
if locale.is_und() { if locale.is_und() {
return None; let message = self.message(&self.default_locale, key).ok()?;
return Some((message, self.default_locale.clone()));
} }
iter.step(); iter.step();