1
0
mirror of https://github.com/gnosygnu/xowa.git synced 2026-03-02 03:49:30 +00:00

TemplateStyles: Handle empty files

This commit is contained in:
gnosygnu
2018-10-21 22:25:11 -04:00
parent 4cadd6b89b
commit 0f89d3aa3a
7 changed files with 25 additions and 18 deletions

View File

@@ -70,7 +70,12 @@ public class Xol_name_mgr {
Byte_obj_val include_byte = (Byte_obj_val)fetchLanguageNamesUncachedEnum.Get_by(include_bry);
byte include = include_byte == null ? fetchLanguageNamesUncached__all : include_byte.Val();
Cldr_name_file cldr_file = cldr_loader.Load(String_.new_u8(inLanguage));
Cldr_name_file cldr_file = cldr_loader.Load_or_null(String_.new_u8(inLanguage));
if (cldr_file == null) {
ret = Ordered_hash_.New();
languageNameCache.Add(cacheKey, ret);
return ret;
}
if (lang_names_cached == null)
lang_names_cached = name_loader.Load_as_hash();
@@ -228,7 +233,7 @@ public class Xol_name_mgr {
return namesMwFile;
}
returnMw .Sort_by(Hash_kv_sorter.Instance);
returnMw.Sort_by(Hash_kv_sorter.Instance);
// # 'mw' option; default if it's not one of the other two options (all/mwfile)
return returnMw;
}