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

fix log missing entries

Browse Source
This commit is contained in:
Christof Petig 2021-05-03 23:55:19 +02:00
parent 622d7c5033
commit 7c9b2cf74f
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
voxygen/src/i18n.rs
View File

@ -230,7 +230,8 @@ pub struct LocalizationHandle {
// RAII guard returned from Localization::read(), resembles AssetGuard // RAII guard returned from Localization::read(), resembles AssetGuard
pub struct LocalizationGuard { pub struct LocalizationGuard {
active: AssetGuard<Language>, active: AssetGuard<Language>,
fallback: Option<AssetGuard<Language>>, fallback: Option<AssetGuard<Language>>, // optional display for missing translations
reference: Option<AssetGuard<Language>>, // to determine missing translations
} }
// arbitrary choice to minimize changing all of veloren // arbitrary choice to minimize changing all of veloren
@ -271,7 +272,7 @@ impl LocalizationGuard {
/// Return the missing keys compared to the reference language /// Return the missing keys compared to the reference language
fn list_missing_entries(&self) -> (HashSet<String>, HashSet<String>) { fn list_missing_entries(&self) -> (HashSet<String>, HashSet<String>) {
if let Some(ref_lang) = &self.fallback { if let Some(ref_lang) = self.fallback.as_ref().or(self.reference.as_ref()) {
let reference_string_keys: HashSet<_> = ref_lang.string_map.keys().cloned().collect(); let reference_string_keys: HashSet<_> = ref_lang.string_map.keys().cloned().collect();
let string_keys: HashSet<_> = self.active.string_map.keys().cloned().collect(); let string_keys: HashSet<_> = self.active.string_map.keys().cloned().collect();
let strings = reference_string_keys let strings = reference_string_keys
@ -329,6 +330,11 @@ impl LocalizationHandle {
} else { } else {
None None
}, },
reference: if !self.use_english_fallback {
self.fallback.map(|f| f.read())
} else {
None
},
} }
} }