Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't perform partial localisation of content, prefer all-or-nothing

Browse Source
This commit is contained in:
Joshua Barretto 2023-04-12 12:11:53 +01:00
parent 16e3227f78
commit cb5d0f5a95
1 changed files with 32 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
client/i18n/src/lib.rs
View File

@ -334,28 +334,41 @@ impl LocalizationGuard {
/// Localize the given content.
pub fn get_content(&self, content: &Content) -> String {
fn get_content_inner(lang: &Language, content: &Content) -> Option<String> {
match content {
Content::Plain(text) => text.clone(),
Content::Localized { key, seed, args } => self
.get_variation_ctx(
Content::Plain(text) => Some(text.clone()),
Content::Localized { key, seed, args } => lang
.try_variation(
key,
*seed,
Some(
&args
.iter()
.map(|(k, arg)| {
(k, match arg {
LocalizationArg::Content(content) => {
FluentValue::String(self.get_content(content).into())
},
Some((k, match arg {
LocalizationArg::Content(content) => FluentValue::String(
get_content_inner(lang, content)?.into(),
),
LocalizationArg::Nat(n) => FluentValue::from(n),
}))
})
})
.collect(),
.collect::<Option<_>>()?,
),
)
.into_owned(),
.map(Cow::into_owned),
}
}
get_content_inner(&self.active, content)
// If part of the localisation failed, use the fallback language
.or_else(|| self.fallback.as_ref().and_then(|fb| get_content_inner(fb, content)))
// If all else fails, just display the localisation key
.unwrap_or_else(|| match content {
Content::Plain(text) => text.clone(),
Content::Localized { key, .. } => key.clone(),
})
}
/// Get a localized text from the variation of given key with given
/// arguments
///