mirror of
https://github.com/gnosygnu/xowa.git
synced 2026-03-02 03:49:30 +00:00
v2.7.3.1
This commit is contained in:
@@ -59,7 +59,7 @@ public class Xoa_lang_mgr implements GfoInvkAble {
|
||||
switch (fld_idx) {
|
||||
case 0: code = csv_parser.Load(src, fld_bgn, pos); break;
|
||||
case 1: name = csv_parser.Load(src, fld_bgn, pos); break;
|
||||
default: throw Exc_.new_unhandled(fld_idx);
|
||||
default: throw Err_.new_unhandled(fld_idx);
|
||||
}
|
||||
fld_bgn = pos + 1;
|
||||
++fld_idx;
|
||||
@@ -90,7 +90,7 @@ public class Xoa_lang_mgr implements GfoInvkAble {
|
||||
Cfg_nde_obj lang_grp = lang_root.Grps_get(key);
|
||||
if (lang_grp == null) {
|
||||
Xol_lang_itm itm = Xol_lang_itm_.Get_by_key(key);
|
||||
if (itm == null) throw Exc_.new_("unknown lang group or key", "key", String_.new_u8(key));
|
||||
if (itm == null) throw Err_.new_wo_type("unknown lang group or key", "key", String_.new_u8(key));
|
||||
langs.Add(key, Xoac_lang_grp.Regy_get_or_new(key));
|
||||
}
|
||||
else
|
||||
|
||||
@@ -48,7 +48,7 @@ public class Xol_case_itm_ {
|
||||
case Byte_ascii.Num_2: cur_cmd = Xol_case_itm_.Tid_lower; fail = false; break;
|
||||
}
|
||||
}
|
||||
if (fail) throw Exc_.new_("cmd is invalid", "cmd", String_.new_u8(src, fld_bgn, src_pos));
|
||||
if (fail) throw Err_.new_wo_type("cmd is invalid", "cmd", String_.new_u8(src, fld_bgn, src_pos));
|
||||
break;
|
||||
case 1: cur_lhs = csv_parser.Load(src, fld_bgn, src_pos); break;
|
||||
}
|
||||
@@ -82,8 +82,8 @@ public class Xol_case_itm_ {
|
||||
private static int parse_mw_grp(Ordered_hash hash, byte[] raw, boolean section_is_upper, int find_bgn) {
|
||||
byte[] find = section_is_upper ? parse_mw_upper : parse_mw_lower;
|
||||
int raw_len = raw.length;
|
||||
int pos = Bry_finder.Find_fwd(raw, find, find_bgn); if (pos == Bry_.NotFound) throw Exc_.new_("could not find section name", "name", String_.new_u8(find));
|
||||
pos = Bry_finder.Find_fwd(raw, Byte_ascii.Curly_bgn, pos, raw_len); if (pos == Bry_.NotFound) throw Exc_.new_("could not find '{' after section name", "name", String_.new_u8(find));
|
||||
int pos = Bry_finder.Find_fwd(raw, find, find_bgn); if (pos == Bry_.NotFound) throw Err_.new_wo_type("could not find section name", "name", String_.new_u8(find));
|
||||
pos = Bry_finder.Find_fwd(raw, Byte_ascii.Curly_bgn, pos, raw_len); if (pos == Bry_.NotFound) throw Err_.new_wo_type("could not find '{' after section name", "name", String_.new_u8(find));
|
||||
int itm_bgn = 0;
|
||||
boolean quote_off = true, itm_is_first = true;
|
||||
byte[] cur_lhs = Bry_.Empty;
|
||||
|
||||
@@ -129,7 +129,7 @@ public class Xol_case_mgr implements GfoInvkAble, Gfo_case_mgr {
|
||||
}
|
||||
public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) {
|
||||
if (ctx.Match(k, Invk_add_bulk)) Add_bulk(m.ReadBry("v"));
|
||||
else if (ctx.Match(k, Invk_clear)) throw Exc_.new_unimplemented();
|
||||
else if (ctx.Match(k, Invk_clear)) throw Err_.new_unimplemented();
|
||||
else return GfoInvkAble_.Rv_unhandled;
|
||||
return this;
|
||||
} private static final String Invk_clear = "clear", Invk_add_bulk = "add_bulk";
|
||||
|
||||
@@ -43,7 +43,7 @@ public class Xol_cnv_grp implements GfoInvkAble {
|
||||
case Byte_ascii.Pipe:
|
||||
switch (fld_idx) {
|
||||
case 0: src = csv_parser.Load(raw, fld_bgn, pos); break;
|
||||
default: throw Exc_.new_unhandled(fld_idx);
|
||||
default: throw Err_.new_unhandled(fld_idx);
|
||||
}
|
||||
fld_bgn = pos + 1;
|
||||
++fld_idx;
|
||||
|
||||
@@ -47,7 +47,7 @@ class Xol_cnv_mgr_fxt {
|
||||
public Xop_fxt Parser_fxt() {return parser_fxt;} private Xop_fxt parser_fxt;
|
||||
public void Clear() {
|
||||
app = Xoa_app_fxt.app_();
|
||||
Xol_lang lang = app.Lang_mgr().Get_by_key_or_new(Bry_.new_u8("zh"));
|
||||
Xol_lang lang = app.Lang_mgr().Get_by_key_or_new(Bry_.new_a7("zh"));
|
||||
Xol_lang_.Lang_init(lang);
|
||||
Init_cnv(app, "zh", "zh-hant", KeyVal_.new_("x0", "x1"));
|
||||
lang.Vnt_mgr().Enabled_(true);
|
||||
|
||||
@@ -27,7 +27,7 @@ class Xol_gender__basic implements Xol_gender {
|
||||
case Xol_gender_.Tid_male: return when_m;
|
||||
case Xol_gender_.Tid_female: return when_f;
|
||||
case Xol_gender_.Tid_unknown: return when_u;
|
||||
default: throw Exc_.new_unimplemented();
|
||||
default: throw Err_.new_unimplemented();
|
||||
}
|
||||
}
|
||||
public static final Xol_gender__basic I = new Xol_gender__basic(); Xol_gender__basic() {}
|
||||
|
||||
@@ -32,13 +32,13 @@ public class Xol_vnt_mgr implements GfoInvkAble {
|
||||
if (!enabled) return;
|
||||
Xop_vnt_lxr_.set_(wiki);
|
||||
// VNT
|
||||
// vnt_grp.Add(new Xolg_vnt_itm(Bry_.new_u8("zh-hans"), Bry_.new_u8("Simplified")));
|
||||
// vnt_grp.Add(new Xolg_vnt_itm(Bry_.new_u8("zh-hant"), Bry_.new_u8("Traditional")));
|
||||
// vnt_grp.Add(new Xolg_vnt_itm(Bry_.new_u8("zh-cn"), Bry_.new_u8("China")));
|
||||
// vnt_grp.Add(new Xolg_vnt_itm(Bry_.new_u8("zh-hk"), Bry_.new_u8("Hong Kong")));
|
||||
// vnt_grp.Add(new Xolg_vnt_itm(Bry_.new_u8("zh-mo"), Bry_.new_u8("Macau")));
|
||||
// vnt_grp.Add(new Xolg_vnt_itm(Bry_.new_u8("zh-sg"), Bry_.new_u8("Singapore")));
|
||||
// vnt_grp.Add(new Xolg_vnt_itm(Bry_.new_u8("zh-tw"), Bry_.new_u8("Taiwan")));
|
||||
// vnt_grp.Add(new Xolg_vnt_itm(Bry_.new_a7("zh-hans"), Bry_.new_a7("Simplified")));
|
||||
// vnt_grp.Add(new Xolg_vnt_itm(Bry_.new_a7("zh-hant"), Bry_.new_a7("Traditional")));
|
||||
// vnt_grp.Add(new Xolg_vnt_itm(Bry_.new_a7("zh-cn"), Bry_.new_a7("China")));
|
||||
// vnt_grp.Add(new Xolg_vnt_itm(Bry_.new_a7("zh-hk"), Bry_.new_a7("Hong Kong")));
|
||||
// vnt_grp.Add(new Xolg_vnt_itm(Bry_.new_a7("zh-mo"), Bry_.new_a7("Macau")));
|
||||
// vnt_grp.Add(new Xolg_vnt_itm(Bry_.new_a7("zh-sg"), Bry_.new_a7("Singapore")));
|
||||
// vnt_grp.Add(new Xolg_vnt_itm(Bry_.new_a7("zh-tw"), Bry_.new_a7("Taiwan")));
|
||||
}
|
||||
public Xol_vnt_itm Get_or_new(byte[] key) {
|
||||
Xol_vnt_itm rv = (Xol_vnt_itm)vnts.Get_by(key);
|
||||
|
||||
@@ -53,7 +53,7 @@ class Xop_vnt_flag_ {
|
||||
case Tid_macro : return "macro";
|
||||
case Tid_name : return "name";
|
||||
case Tid_lang : return "lang";
|
||||
default : throw Exc_.new_unhandled(tid);
|
||||
default : throw Err_.new_unhandled(tid);
|
||||
}
|
||||
}
|
||||
public static final byte Tid__max = 12;
|
||||
|
||||
@@ -86,7 +86,7 @@ class Xop_vnt_lxr_end implements Xop_lxr {
|
||||
vnt_tkn.Vnt_cmd_calc(wiki, ctx.Cur_page(), ctx, src);
|
||||
}
|
||||
catch (Exception e) {
|
||||
ctx.App().Usr_dlg().Warn_many("", "", "vnt.parse failed: page=~{0} src=~{1} err=~{2}", String_.new_u8(ctx.Cur_page().Ttl().Raw()), String_.new_u8(src, bgn_pos, cur_pos), Err_.Message_gplx_brief(e));
|
||||
ctx.App().Usr_dlg().Warn_many("", "", "vnt.parse failed: page=~{0} src=~{1} err=~{2}", ctx.Cur_page().Ttl().Raw(), String_.new_u8(src, bgn_pos, cur_pos), Err_.Message_gplx_full(e));
|
||||
if (vnt_tkn != null)
|
||||
root.Subs_add(tkn_mkr.Bry_mid(src, vnt_tkn.Src_bgn(), cur_pos));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user