From 75691d1f7f4171004a3c61e7e631c8cae93d835e Mon Sep 17 00:00:00 2001 From: walon Date: Fri, 18 Jun 2021 17:49:49 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=94=B9=E5=8A=A8=E3=80=91cfg=20--inp?= =?UTF-8?q?ut=5Fl10n=5Ftext=5Ffiles=20=E7=9A=84=E5=8F=82=E6=95=B0=E7=94=B1?= =?UTF-8?q?=E5=8E=9F=E6=9D=A5=E7=9B=B8=E5=AF=B9=E4=BA=8E=20--input=5Fdata?= =?UTF-8?q?=5Fdir=E7=9B=AE=E5=BD=95=EF=BC=8C=E6=94=B9=E4=B8=BA=E7=9B=B8?= =?UTF-8?q?=E5=AF=B9=E5=BD=93=E5=89=8D=E7=9B=AE=E5=BD=95=E3=80=82=E4=B8=8E?= =?UTF-8?q?--branch=5Finput=5Fdata=5Fdir=20=E4=B8=80=E8=87=B4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/L10N_生成_简体.bat | 2 +- config/L10N_生成_繁体.bat | 4 ++-- config/NotLocalized_TW.txt | 9 +++++++++ config/{Datas/l10n => l10n/cn}/TextTable_CN.xlsx | Bin .../{Datas => }/l10n/cn/test/full_type_cn1.xlsx | Bin .../{Datas => }/l10n/cn/test/full_type_cn2.xlsx | Bin config/l10n/en/TextTable_EN.xlsx | Bin 0 -> 9793 bytes .../{Datas => }/l10n/en/texx/full_type_en.xlsx | Bin src/Luban.Job.Cfg/Source/JobController.cs | 2 +- 9 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 config/NotLocalized_TW.txt rename config/{Datas/l10n => l10n/cn}/TextTable_CN.xlsx (100%) rename config/{Datas => }/l10n/cn/test/full_type_cn1.xlsx (100%) rename config/{Datas => }/l10n/cn/test/full_type_cn2.xlsx (100%) create mode 100644 config/l10n/en/TextTable_EN.xlsx rename config/{Datas => }/l10n/en/texx/full_type_en.xlsx (100%) diff --git a/config/L10N_生成_简体.bat b/config/L10N_生成_简体.bat index 2ed68f6..534e47e 100644 --- a/config/L10N_生成_简体.bat +++ b/config/L10N_生成_简体.bat @@ -8,7 +8,7 @@ -s client ^ --gen_types data_lua ^ --export_test_data ^ - --input_l10n_text_files l10n/TextTable_CN.xlsx ^ + --input_l10n_text_files l10n/cn/TextTable_CN.xlsx ^ --output_l10n_not_converted_text_file NotLocalized_CN.txt pause \ No newline at end of file diff --git a/config/L10N_生成_繁体.bat b/config/L10N_生成_繁体.bat index c4c985e..16c9cfd 100644 --- a/config/L10N_生成_繁体.bat +++ b/config/L10N_生成_繁体.bat @@ -8,8 +8,8 @@ -s client ^ --gen_types data_lua ^ --export_test_data ^ - --input_l10n_text_files l10n/TextTable_CN.xlsx ^ + --input_l10n_text_files l10n/cn/TextTable_CN.xlsx ^ --l10n_text_field_name text_tw ^ - --output_l10n_not_converted_text_file NotLocalized_CN.txt + --output_l10n_not_converted_text_file NotLocalized_TW.txt pause \ No newline at end of file diff --git a/config/NotLocalized_TW.txt b/config/NotLocalized_TW.txt new file mode 100644 index 0000000..eb0a534 --- /dev/null +++ b/config/NotLocalized_TW.txt @@ -0,0 +1,9 @@ +/asfa|aabbcc +/asfa32|aabbcc22 +key_name|aabbcc +key1|asdfa4 +key2|asdfa7 +key3|asdfa8 +lua/key1|lua text +xml_key1|xml text +xml_key2|xml text222 diff --git a/config/Datas/l10n/TextTable_CN.xlsx b/config/l10n/cn/TextTable_CN.xlsx similarity index 100% rename from config/Datas/l10n/TextTable_CN.xlsx rename to config/l10n/cn/TextTable_CN.xlsx diff --git a/config/Datas/l10n/cn/test/full_type_cn1.xlsx b/config/l10n/cn/test/full_type_cn1.xlsx similarity index 100% rename from config/Datas/l10n/cn/test/full_type_cn1.xlsx rename to config/l10n/cn/test/full_type_cn1.xlsx diff --git a/config/Datas/l10n/cn/test/full_type_cn2.xlsx b/config/l10n/cn/test/full_type_cn2.xlsx similarity index 100% rename from config/Datas/l10n/cn/test/full_type_cn2.xlsx rename to config/l10n/cn/test/full_type_cn2.xlsx diff --git a/config/l10n/en/TextTable_EN.xlsx b/config/l10n/en/TextTable_EN.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..323a6fbec6ccb79c429316c1a2de938919d17ade GIT binary patch literal 9793 zcmeHt^;?u%_x?~r_s}T9kkTa~-Q6G|&CneJ(jnd5DItw?Dj-qi_b+(g{loKIb3MXhrR#5@n5_G6&eHf-E24=&o+f6I<>;{ zL(9rg$Xm(vs5g+)JQB328`ntauYKsuRW)l-x@c5wNA+lr1c)nVX?4UzR%}@=b(E=% z&`Y8#oeu?E$|uAS*P_ny^??-BHmHa@V7Au6G?O{SYe; z6BeiGc>KK#{^IMF;6S$yygY*&u?eq7kQy_o+`_Z=c2y2eE$Zq_mj{|GNoUavpjwrd z`b!Gg&B1X{o_?(*3BNdnh*bq#sT~Ie24@H=PAxm=@R5Z-kQEGV9c<=6>zVcNHrkRV zZp~h)YIHNaei}Fy7p0k}Jo(nW#d+P#3bTbcTBCK@9OeabS9V zL=-T(@hFEq?!dDn7{w(7#|jEqXx+g*CU>cX-#|S$*5V=BC%Q_)ikaZ$jm??`q`Dgu z#aHp4U?2uyY>PWvem#vMzbK!>f@T+pQhZA}z#_Ya@$Bvn0ig0Xnl@;%fsbLnrvQ73 z4x_1|GsM<~mF4I4fAst>=Hy?dUXh@v+{1cNdjuqtx*Amz~FM zh%TfigTA99$I&1SLXh_B@Vy?Kg9=1%_EVlNb5%s*fu4dJ-77;6H3Hn`3EM}^_`)w&tE=V=iE%~f!Omdw0 zsXPtMY~LSAWWK|{@n%-a>Q|%U!aL^}mF}a-JMq)4=Q!#j%T7<#R2|{wUWHLlYJ&X3cFHZ2wM0lO1dw4h;B8~$}1E7o+4H704NXVr{gDP#36C*k(Q@?hK=dto#Zy}ys=CHf2;W>Rdg7uFJ8q0NA+RMlP& z)q`lFi|)RQ=KVrX-Sb3GgL6b8*$k;VT%kyc_axb73S%Q$vElBY)j^^u*b2En>}znc z+zPylonk3i7f<}Sf_A$2wi}x%0v(3yB<4TQ-GJU|=&i%U>3g{M@J95p&7V%?7St1j zG4bo5Ljm?eoe8hlw z?(ESMxMP`M3)3tqA%iFr;f&Y$!r@Z+xzdu&VSSM%?0fjDNz2}-m>A1; zl8d*2SS8iof+avugFDK3;3MRzuKno&2N);*$(jJ6q|_tWlU7)0AqAko!C3Q0boncH z{u627U_ubaz5nh}p{6MR0VagdZ$sJKGhYzk&bYEtZEJ2}qYTtD%+XSE`W`QmJ#N+4 zo|0!pa0v0-8}55?#*MX%fPd1(SQ>$c_!8fC?Gc@wroAZlEW{*bxb;tN^AbU~FT8lJUGt@)YH;{n}j7bHt{r@DgKV}w)@U4&lS@%YCtjXWRMXkd*E0B?J(FvGeu!t;n z`VtSvQxc4rW*ue$H`3)?n_k}8doC}_?lNcsAFXnTcom^7zNMb|f+3$s#Dy&1Eg3>E zACXOiF6#6g2zj$M+h_qvTPqdY@5RB$p^o~DNf#Og6PCDKy=ccnf{d#K%wX|v985V_ zy9~a(x}4ZUOH`-X>7k&*A?1G!Rp za%^GzfvYQ2!)K`^HfiS+&62M8=_>`d^7DhE5IJ~3wE5z4CsbuP#M|hot~Q`e!jg-p zP_6b3!fK47GD2LChQO7opeswh=I2#B#C7>N&N~YnkrV~TPL7uE9XBiU%TlGER4H~!^oSJt~K+)JYxsr`;OwRU>PTrZY0 z0#gXW_&?IVRkyQD>!RvvBIMiAY_r=UaQ)KAeNw^IXtx_3b9^ffKA$4ZY}I%$)5zEH z0_qyo;Tt_G)fB#6@%o`Af?zTF^ntF6X#n>*)Wn4(!V3R@6a;oPdqK!ubAH(!LH zEinkp_832hQ84(#%!B2dO~z5&da8bCjsw!dn6mb^HcNC8?b;_qD%D}lxrx{9pA%hy zz4OjUM+YyPLIsgtwU}n^cT;DTZw(`z#g~a2gPQY}<8R;(kvN)-*wTj-#r@G(lHM!8 zXo2wPL)H!tf;SP z)L&BkTzKiZyp?5=qHrOo_7~_(*Y1srzFSnY3Aiz}$cN!y#h8T?oEtTnB5*OlP65M? z@QaGXvGKvuLd-FI{J;)&W-YlQU3MwzgAT;rywh1TF{!UtH)E`R-Y5G_*g_$~eqMai zx!n@sAZsIui_Q!kf3%CW$6vbq9E0mpJpI9o&rN|V+abaJlD-&Eh zh?s_b9QP{lk}h!w@na}~AYJam3R=uSw$g@Ym)!n?ZqMH>RG-)|`jGldfwiryBP;6+ zegH|P07VoJTD?vT8f=#^Zzj1j=khNb_DPdAv8VQfM2Xrhm$>PBLv7A$zHA@c-jF6O z+t{4Hd;>+_O!38xpqIs({#;a}wZrnPEl`0N>eQWS%vSo0V~r2(t#Puxbp)#XYVq^P zF}sh*02Pr4YFUAnv?WwhQ4V)p8ssdGHZxMuM2ytOMWS!e?j{}bgnxt;Fh^ln zL5Q@erb3bgbBLWd5}EHfEKe}|SEOT=cJDl#?@AJ}g#}vf^q(|oK?Zj6%&Z4*PEJbv z{0;)n*0Bw5PrlW;ZhrAFUe5Kt8cWRe^T~Lr?X(-wm+N=8+P6m`e7zd$@Q}B@iI1Oc zNgU5~Nx!#m0h6!?{=w-A!mSBj4+^e4yky>7ek&^&-NP-Q6n(m@5#7Pbh=gc={JIgc z<@;ehf!Dkfub0pvE>KLms-=y-7Jfc=)ZZXn9>UX| zl0MBKN1d^ZD6j0(hsFM)V%JBE>D_KTu0^2Y>ocJP{xDvB4r*jAsx`5v)FI7G&w*m4 z%!}L5L;k2%EohJQ6TC*G0<4wLG+q1l;O}_7EXm>^^)E|pGEywyGa_%Z7(r4HZcafjs7X0Dt>=}_9Vi-%1k_2;s9 z>k2t@b>DPEvP>4zdccv9z`L*~N=uQk(E^`SLt`?=;QD&f~JZo~YNyLiS$ z+d?^SF;BOdm2gMlY1o%DxeQ;G>b*fP$x4)~9vjO?ZI{bK3-)&6U&{bIka9lbvFdn8 zxwWk}+MQjEZr{7-c}l!JG{@S?Dhhm8gMoA9a%CP?$}O71CXR>{5@|2`0nLx4U__Jo ziTj}9wqj-|92&TMAzb$G)AG8;4F2s?NNk%wUr=CQ<+-L@wqnv-m$LUW!B^NR+=5)n zRi?bMQ+!+PWqj4v*LOaebylpo(;Vv!pFEjYUS7RqZcs4j6oDkVd%BL&Eqpyp$B{c* z3tZOEZxe!Fu>6QXJh4L$O?=(}u)y{HM5;h&KNz2Kz?-;-OR^(v39QV2Yj30^S^V;G zI|=@0_VJ$9!U*LbQ$8i0?R_7uO6s0#=?_o5f*bPg*x6D5+0xkE%i&Ntb$=$oVE6PQ`?k^HHp;`b?{nr?s0^nV|G*W^j~iT{PP` zTOiRA)6?OUE1i$6>7f%G$}J`>WX_zM(bKp#l2j$l0kpL0pFcdczi6;VNo53c*<9dn z5cl+X09(KldPD{4%|0ZuIritN#wjF3Z$l-L_@5^#4FcKY)4Y;CFdH)aC1Y}pkr&u8 zKJ&*}&|b+9VRXoF!f}1t@4?XpwhDm~tL7+C1T3jnIr^6O8a}L`o+0n5WjZezG*aQIo%#H&X*Je=8sf)QIKYq)6E@T^=V9* zk%CxxCZj8Vi$x%<4B<3c8EQc>Ip_kk`fgF&`*?H0HSx#R(^bs!L-C2XkBjVYl$f2X zY*<>b@FqRw1Xd<|Vi3C6m~%gIDC)E;^+eRwsm|4NGNE87PdqudbCco~Ja|hd+@C$7 z>n6gqC6|4E`F*~9(j2)dK;WgLA8(1;hDvufx3tP}5l>hxMgBXW4Eh|s<4^7xakz3xjQd%d)FYg8oJmw zq?dsXCL~Jl%w@IiIl1v^S#EttQI_es2o~XYw@DVQo86v38@BdRL3x=il|NJIhSs6m zv_N*;YFx!m*31r!Bm5Ak zeFIj^yt8U{X$cHi%J5O8Od12L9K8-zE)G%gwGt`8jI!$Og}_|%(OjC3ySyE`s@Aw7 zGKtH{4O?&aGEF3r*y*elX|gor&`pfXQ#*BRk_qofF&ES>G&F~u_Y*L>hm6~ou90lEC~19P?Lah zL%apwZ#i)}46#2}9L-cXY`527OPUJPN3rQsGPZ?m(QEEf6*4Pz@&J|8z#q{XduF>a zdEL-TCicCt6vvw2ucHZKPDSyr#znuAMp6eh^6Yl{c3z!Ap=Du4-qX5;AMGUT0|+hS zf#Mc6q@iN+z z(WU*`J0{GCq?|^(98l`a@?BA5tqsvqPo|P+va|@hr)*oC4a=wY+f=5+Rv@wi{c5t^ z`h%wrq43=d^y|-dmpUqUji(6`$l}qxREvpoYUEFSQ3G6u2&hNq>R&? ze1l7a_$ZiuE3<^ITH<*d1=yz4Q<2$MV}~*bRT+*Y*dewz>`vJD0>h? zj$FA@6i@;%tRG|Qr5Lebr9C~2 zg|k)Qu>PkG>sCH`tf^U1Mwu~56$w!sa@&J1X&;BHzcmmhM?|KwquwpvEVP}4sYV2m z&YH&`Bk>&AcKYM4G&*`4a35UG9)6;d!lQS$RCF|71|~L}DJqkw!K>-8C~m_A%LmKM znZhM|;&N1VHdCR|m-dy)nGv&Z%EYpxSijb$XNvQ`BnRtF@TE2L#;Rst>A7h=e3#af zLg_OEU`*vi(U#hHbJW%J47`el#TfIp7lkxGVYz_myctD-DF`Dm_lM%t=kUn>>dSU` zCg1~w@m7T@>_liMmf7bH`BrS%y261aE+hVj8vHEGF(|^MH+IuPa=W9hSOD4pl^frZ zb+4e206ecf9z(CIpp_RdPqK36&0J7-ricuYiTj+igk;`1fxAOu;#}*PrRAmE9YQbA zwl_4Aa)jPg`m}Y(PRdi zA_m(x@E?2jv*Pn-68}dD=yxjrs{j-n+ZEBx29i8OxE1&CN}PIyA+F9t)vURWU~)MN zoJ);61KoJlkwf0EtvQaaJ;}Thctd8670)!$3jb==l*qDX-)olnooFrZ<~#_MSs>2% z3rlAPf|8P4cwd}00ebB#Rq7k!9^Vf$wK1q~;)K4>$cB5e4O~Q$eXc08wmURLu4h$h z*kfAtc^1SksHStf9pghGU|;xdMCNcbSe7r&NT@)DuU~TK(BDLK%l$OR#s>?r*zVKN z(J8D@@lUTcFa!dSOG_vyShT0)gi8~KmC^V-fwmm6DxZ(qkbb9vwl;0 z<9>^Nh>8)45xq%2;t|1n6Eut}3<$;>kuib12)sv;0bNKHKR?% zPr(RuJxuoaF(9B6@I?p;E$t&rDiUIH5(R(i20*_A4qz-wh8XG{Ccr5(Ku?SrFor{n z2?r}^|Jwv^!zrPnuUZK@|NMvH8-XBiiA`noGe8&n z#3NC@NLh*f*y(`y(^2FO4yVDv?1sf3c)4r26 zYS2pFJSzMwXM|7O#q>=iIZ4nT*5=TUhMtB29=vBUb5$0{@yIw~??dy%SIZBdczHjb zE|pmh4nClw9^%OP;whK7+Cg@?9v{YX+zWiDP zkbU_K!cX{EKJWwSKn^7J0dO1h#q6Bx`-g?~(Zx!0>JHR?%hS?o%ieQeD_*5Vxg%vN zIj01C>EyCkuQ}P=T*V*4d;IM2)&r0&a(MR83b-~*NJIjG0gRrCrUecmS(lyuT*^f` z6R&phmHsuCeRK8W!lm)8DH;90{v|&Mf!*7eLZ>~;l3XFjc`eJ ze+~Xs9o+}KFE4%rUX%Xs&4G92rJOBXxApq{1|NZ3tt2y_hznK4d Xj;qKc{Zbwn01N;v%#D$L(g*N=n2oL@ literal 0 HcmV?d00001 diff --git a/config/Datas/l10n/en/texx/full_type_en.xlsx b/config/l10n/en/texx/full_type_en.xlsx similarity index 100% rename from config/Datas/l10n/en/texx/full_type_en.xlsx rename to config/l10n/en/texx/full_type_en.xlsx diff --git a/src/Luban.Job.Cfg/Source/JobController.cs b/src/Luban.Job.Cfg/Source/JobController.cs index 1c2da00..cae212b 100644 --- a/src/Luban.Job.Cfg/Source/JobController.cs +++ b/src/Luban.Job.Cfg/Source/JobController.cs @@ -237,7 +237,7 @@ namespace Luban.Job.Cfg if (needL10NTextConvert) { ass.InitL10n(args.TextValueFieldName); - await DataLoaderUtil.LoadTextTablesAsync(agent, ass, args.InputDataDir, args.InputTextTableFiles); + await DataLoaderUtil.LoadTextTablesAsync(agent, ass, ".", args.InputTextTableFiles); } timer.StartPhase("validate");