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

Fall back to single message if variations don't exist for localisation

Browse Source
This commit is contained in:
Joshua Barretto 2023-04-11 19:06:40 +01:00
parent 85a3d0bec4
commit c69307557d
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,7 +116,9 @@ impl Language {
let msg = bundle.get_message(key)?; let msg = bundle.get_message(key)?;
let mut attrs = msg.attributes(); let mut attrs = msg.attributes();
if attrs.len() != 0 { let mut errs = Vec::new();
let msg = if attrs.len() != 0 {
let idx = usize::from(seed) % attrs.len(); let idx = usize::from(seed) % attrs.len();
// unwrap is ok here, because idx is bound to attrs.len() // unwrap is ok here, because idx is bound to attrs.len()
// by using modulo operator. // by using modulo operator.
@ -134,16 +136,17 @@ impl Language {
// * len = 0 // * len = 0
// * no matter what seed is, we return None in code above // * no matter what seed is, we return None in code above
let variation = attrs.nth(idx).unwrap(); let variation = attrs.nth(idx).unwrap();
let mut errs = Vec::new(); bundle.format_pattern(variation.value(), args, &mut errs)
let msg = bundle.format_pattern(variation.value(), args, &mut errs);
for err in errs {
tracing::error!("err: {err} for {key}");
}
Some(msg)
} else { } else {
None // Fall back to single message if there are no attributes
bundle.format_pattern(msg.value()?, args, &mut errs)
};
for err in errs {
tracing::error!("err: {err} for {key}");
} }
Some(msg)
} }
} }