langfingaz/anki
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make sure English takes priority if it's listed first

Browse Source
This commit is contained in:
Damien Elmes 2020-02-21 22:01:35 +10:00
parent e31d576740
commit f8c4fb5e29
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rslib/src/i18n/mod.rs
View File

@ -125,9 +125,17 @@ impl I18n {
for code in locale_codes { for code in locale_codes {
if let Ok(lang) = code.as_ref().parse::<LanguageIdentifier>() { if let Ok(lang) = code.as_ref().parse::<LanguageIdentifier>() {
langs.push(lang.clone()); langs.push(lang.clone());
if let Some(path) = lang_folder(lang, &ftl_folder) { if let Some(path) = lang_folder(lang.clone(), &ftl_folder) {
supported.push(path); supported.push(path);
} }
// if English was listed, any further preferences are skipped,
// as the fallback has 100% coverage, and we need to ensure
// it is tried prior to any other langs. But we do keep a file
// if one was returned, to allow locale English variants to take
// priority over the fallback.
if lang.language() == "en" {
break;
}
} }
} }
// add fallback date/time // add fallback date/time