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

Merge branch 'umr1352/fix#1260' into 'master'

Browse Source 
fix issue #1260: give a warning if an error occurs on language files load

Closes #1260

See merge request veloren/veloren!2724
This commit is contained in:
Marcel 2021-08-03 21:09:06 +00:00
commit b7bd81388c
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
voxygen/i18n/src/lib.rs
View File

@ -113,17 +113,25 @@ impl common_assets::Compound for Language {
// Walk through files in the folder, collecting localization fragment to merge
// inside the asked_localization
let mut fragments = HashMap::new();
for fragment_asset in cache
for id in cache
.load_dir::<RawFragment<String>>(asset_key, true)?
.iter()
.ids()
{
let id = fragment_asset.id();
// don't try to load ._manifest files
if id.ends_with("._manifest") {
// Don't try to load manifests
if id.ends_with(&[".", LANG_MANIFEST_FILE].concat()) {
continue;
}
let read = fragment_asset.read();
fragments.insert(PathBuf::from(id), read.clone());
match cache.load(id) {
Ok(handle) => {
let fragment: &RawFragment<String> = &*handle.read();
fragments.insert(PathBuf::from(id), fragment.clone());
},
Err(e) => {
warn!("Unable to load asset {}, error={:?}", id, e);
},
}
}
Ok(Language::from(RawLanguage {