Archives/gnosygnu_xowa
1
0
Fork 0
mirror of https://github.com/gnosygnu/xowa.git synced 2026-03-02 03:49:30 +00:00
Code Issues Projects Releases Wiki Activity

Dev: Convert file-names with underscores to keys; EX: En_gb -> en-gb [#349]

Browse Source
This commit is contained in:
gnosygnu
2019-02-01 22:46:38 -05:00
parent 6b5c014e75
commit 5daf74516a
4 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
400_xowa/src/gplx/xowa/langs/names/Xol_name_mgr.java
View File

@@ -36,10 +36,10 @@ public class Xol_name_mgr {
* @return String Language name or empty
* @since 1.20
*/
public String fetchLanguageName(String code, String inLanguage, String include) {
public String fetchLanguageName(String code, String inLanguage, String include, byte[] page_url) {
code = String_.Lower(code);
if (include == null) include = "all";
Ordered_hash array = fetchLanguageNames(inLanguage, include);
Ordered_hash array = fetchLanguageNames(inLanguage, include, page_url);
Keyval rv = (Keyval)array.Get_by(code);
return rv == null ? "" : rv.Val_to_str_or_null();
}
@@ -59,7 +59,7 @@ public class Xol_name_mgr {
private Ordered_hash lang_names_cached;
private Ordered_hash lang_files_cached;
public Ordered_hash fetchLanguageNames(String inLanguage, String include_str) {
public Ordered_hash fetchLanguageNames(String inLanguage, String include_str, byte[] page_url) {
if (inLanguage == null) inLanguage = "null";
String cacheKey = inLanguage + ":" + include_str;
if (languageNameCache == null)
@@ -70,6 +70,9 @@ public class Xol_name_mgr {
byte include = include_byte == null ? fetchLanguageNamesUncached__all : include_byte.Val();
Cldr_name_file cldr_file = cldr_loader.Load_or_empty(inLanguage);
if (cldr_file == Cldr_name_file.Empty) {
Gfo_usr_dlg_.Instance.Warn_many("", "", "lang does not have a cldrName file; lang=~{0} page=~{1}", inLanguage, page_url);
}
if (lang_names_cached == null)
lang_names_cached = name_loader.Load_as_hash();