From 436379860855fe2d1b073a74f4bfa4e7acc96c5b Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Tue, 12 May 2015 07:31:15 -0300 Subject: [PATCH] -Fixed bug in translation remaps, also added proper demo, maybe fixes #1729 --- demos/gui/translation/controls.gd | 20 ++++++++++++++++++++ demos/gui/translation/controls.scn | Bin 1857 -> 2349 bytes demos/gui/translation/engine.cfg | 1 + demos/gui/translation/flag_japan.png | Bin 0 -> 1473 bytes demos/gui/translation/flag_spain.png | Bin 0 -> 3048 bytes demos/gui/translation/flag_uk.png | Bin 0 -> 6544 bytes demos/gui/translation/main.scn | Bin 2051 -> 2671 bytes tools/editor/project_settings.cpp | 5 +++-- 8 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 demos/gui/translation/controls.gd create mode 100644 demos/gui/translation/flag_japan.png create mode 100644 demos/gui/translation/flag_spain.png create mode 100644 demos/gui/translation/flag_uk.png diff --git a/demos/gui/translation/controls.gd b/demos/gui/translation/controls.gd new file mode 100644 index 00000000000..f8403f49a79 --- /dev/null +++ b/demos/gui/translation/controls.gd @@ -0,0 +1,20 @@ + +extends Panel + +# member variables here, example: +# var a=2 +# var b="textvar" + +func _ready(): + # Initialization here + pass + + + + +func _on_back_pressed(): + var s = load("res://main.scn") + var si = s.instance() + get_parent().add_child(si) + queue_free() + pass # replace with function body diff --git a/demos/gui/translation/controls.scn b/demos/gui/translation/controls.scn index 23e2413bc34fe84c615e2304114a844800120777..66e6d47702728619ea9006cdb0234a4899fdaeac 100644 GIT binary patch delta 1944 zcmX|?e{36P8ONWyvwdluUnEVOAGPzIowx~YlQwDBbq(!vcTU_iX}cxMMpePx*|~UD z>^tML+mdbg3WU*>4i#%#H&)_OAe+iG4FqFKQN37048}Il;E%3SFB9EVt)PwxHrP;k z%>*ZX-qU;UbI<#Ip6Bj)U#fq$sdaKnmZ5qz0zBLV@H!75F{hiR*D%150JsTvI_)b! z4QZ;mTR)b|XLV>IUOP}bo6-_Wey%@bB!DL^Fr`j8EP*&V;K`aPt3NTLo`JQb+m$lo zT8bQIw?L8u81!()&RN4B#g%Am)}y5LoTez+Id(#e3FpLBcUsFPlE!fWFPSbikf*fqQoa3G=~Ah&bWO?$ zW5PX*GE1JP4$&PuSp10DRQNz0^XSJiiawJ(?*TJ3$m%nS+6`9h1mr><^)hI|Ixu1- z;>Wf439sdI=FzN{QNQKMXEJ&=t_i20k=#TtryDtCSK@$&8aoQ<>PIno5?8ZvobmV zOJ+11sgqyBcFNC40`lZGyC?vw88hlQ#JZn~jo}>D+8MHdV)?YZhz-GQjFlt{kqNni zKJhwvf;E)5F!uF?!*zf`9Ea_|t;k`~RXCz$lbUdyfq<|J1j0!d%Mb}*H1fV1z}~}w z-GDv>Y(TI47H$yd{=DvNWDd9CgVG0}#5lK^RWhl3@aL>z<%9rO!8aYQ*I}oz6*IU; z^m6fhHY?mvrx41%g`)jtc|dwgxB_=va}VIwg3R0PTv|&SBO};?OUz(I&5B>dCggd` z&@xIUc`Rh&A*!Gw(xrAVS(8+RMe^HFgSeCX&f0J6#vpRcyxILct^*JbVB^RIb%)xI zbsPW@X^?(=LiICQJ$O5tJfb@;3pcBNE|E>nIIi|xBh6~N1E<{P?5w5dO7r$f>20-} zv+gsGI&0*}el<|K1Jh-|@8Zj>Icupte&XBPE5E2+SSjA*I$WVEJ%2COyM_v*=Z^mi zd!#{0L_xaQ4Uh{X=<0eZ!$xcyy#~kd{!)wGk1guc`0>9};+VCN0} z{B`bkufF;@d?7kr47f>Q^znBf#$@w7MYo>IC5^tF!x^+E-lhtgaj3SCB*sOFsD;4ShhidFF;>^YDXG1H;Mqlb1H# zXb9Uw_Wk&yn(>iC%HENQiG$i75Nv_5FWChi!lf_3AbrhVq60+refTF7xjUz)_G()Z z)Y}>RqTS2bpHx@J9r#}Kfv4Ylm;HR-x*PC}G*r#^9*5)9X%^lP>BglJ53SVY7X4*B z#13yJV;*gn)Ux-I#{xn-rC;cTTO}a%DqwxIaD{ZJApQ}((pB_g8hP;qHsf9N{wVVJ zB?PgCGKmoV3xecFSvrCD${TT9dI0&64^f%$;$b|AhiQ@a2I%*90lG*VMrn?AP=^mu z64cSX*es6VV)PAM96O7P6VKoxc2b){b@(64s5ty``KOYBA!!9eqbV#vCmBW_*3+o` zgvYLZJ$N1~R9;bR*tZj(J8+xmV?tneK{qw&p(Ykp0%1~%9NZ#6cVD7g9HlxAeyU}a zYZm83inkS@0L?TfK8lBS+uiY5)H8QO`@>HL@`%=a-2kn!qa1Y0Pbl&y4!lU1iQ3ouAH zvI4g-L~8)}9CcY`2l5VAf%SJ$rCI+rzYj`ztp9 delta 1459 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 T``01=ouDYmsms>C{}Ay%2*||{ literal 0 HcmV?d00001 diff --git a/demos/gui/translation/main.scn b/demos/gui/translation/main.scn index 1e1bd0141e9084b201e833ef74a91d8c216aae73..76c9ba7b45d03327f4e10dfa0e8a81af52eb962e 100644 GIT binary patch delta 1879 zcmYk7eQX>@6~N!_-g)i2IOjTc&L2tr?!!KR#c|U#Y2zk&dwa2CC#l*vO(T_ZyS^LW zU2E^2cK7VKhTfV`NP)JbPX9m@m~i80q&k^LFOVn>TOX9&1`@X+1cps<7Ic08X_681(>uIMMp5ucPMNeES74;m`uDTn2bNWn)X+Lp8GCNvKvuwd} zo575IQDoV)76)5@3duWRG`2pPB61X7>6HthP zsj^6k)a=csYU()}rUi99r1j_hrj;(vl%iMb(zc^J%#QxelX^YzAzDu}v|Ev-Ov$n$ zU)ClGs^O;{_m^~%!m2O&tL|-=9-vlwR@jo#jwnRUB+Is;7t_VU(daW|@?ASpy;_H0 znRq&~gs*RnE-9VT3xO}}q9{qilVfeZ_axS>gc`8?@D(`diN*G4ZgcSJ^H;RkGhj>$pl4`*W%Z~=@|#6ZQzDn zqPAoWj?!YK)g7W%Sn%pwDHVSWoZdUY(%%2sXiDta5c`FHu3(wQZ1Sn!OHulex)S5Q zyqPnN9$0?K7xDG}AaP~+f^Rr}Q~LEy-=XTbTGQJ5Hgx~S^D)&BpETGjA4ylQT-ixy zC(6rh{yWRr9it1kV6R}6x|jXTaSBH6jWP8p8l@Ne$NLXMx^Lw8#nb`crWuUeiEG^7 zZuRe!`T*|dG23-(%^6?DV$A3{L#PybCe#o3Y5uIZve1;|qEmHc$Yw7pkNY3C8BQ+5 z^}1Qy&l9?|_dLBtP<98PQW=3^&Rg0Dy+I?e=k$KA{iHGgE$rTE3?};?8PB>g*jgEb zaV@4;GzJrIe#Yf#U5P`l`=D5jr?jx(zF7%ZUxEjx&p|ZuDc_-d!A2Atbj-3@6U}Li zwqPUV20w1ZjBel*!-7$Em}T_*c2Cp5PANMSIMjC%?9mm$G;jng?B~~-_!nex0PmMG z_8j((nP&euT4Mmm>=$VXZWwqD9)V9FP%X9vj)HW6WX?Kzh~&L8$rDHrXyB_>TL3`dZ&ZLFN(8V5ec(e0 z8aV=IEyrKxBE&z-yavi3^3fffI!-f3M#WV2U)7ym)x}qJ zAFk?FxQ-URSPi;yg{0{FaGSQP<)0I%=P9TLIWdxNNN*=E)9+N9<~i$B+v}`RT0KUx z+C`75Vah=deqQ|%Bv9tEmpc}QJ}yJhzv?dxaQSr@tjPSdm(|Pab=ZVq9^N6YPr&Ai z48we7jYnfXwc^X{GY!MmTImwK$ggM%zoNT%xIWA4_p0H$v8fv3VGi=?Vc3fG)i9O* U)4vDngChL59h^Lk_RD(jC@>Rq95duS=o1gIukBhQm7ddbN2f7=52#3*)F6_dX{J||xg?tk`a6vla zN+i^Y>0COKI5s;Ms18sfltk4GOBSKq3AnV)IY};&?g-V zHAYT+{8HgV&fgz-6w?S85PwkumQ0$x6+8*xxaKq1)CGYq8;s{Om2;gT(>4q|~)e zMQ@nADr?r`ntJ|c?$gc9`*CRCdf}|C$*L?D)@*h8ww1QmAkn&f+JhhQyJlG=JJXL* zc?)~Lg}p?N|Hq0oK9x~btz`{aZ~l$HhvQdK@f(077ibVCQphSH52*bRMezD&3O7(4S&qwXz+VYKzazW4Po+-JmL zKnaWU7>B`YoA`b_m}EHK*9=HORw#{gEP09L`>%*g@@h)HxwGqfg;p@0Xl8i!F3 zgDAu=A&4_1rx4-`1mqIR_zI3m7jZ~(pwN326N9%gKaS7gxXFR|Nc>%V8|s-K;}qRR z6_-gSsp=S3gO^2cb%4Xwp%b_&skn;u6!kwbn=eZTaj|cU63(Ll4Xl@RBNK@5f+#>U zqm>p5C|H7^uTeuR9f+Bo`4SEJpO~qV_@x;uK{&{poh7Nqo*xI@g;GXX4&LjWt|Y3O!z0Z;t|uu=c=@B%m}ww7XC;3LmXo}awxd>I2c zk*6{{woACS?FzC-p_0-kp^Ef4u_w?vx-kuPh^8^HGY6kaYg$$b;yd^xwQONLL>bqGbM!z3^g)byif%&Zq68nbGDp!@{zi5i RbGQio_8A!+k;^}=e*q`8ORN9@ diff --git a/tools/editor/project_settings.cpp b/tools/editor/project_settings.cpp index 85adbd3a3b5..08a1191f41d 100644 --- a/tools/editor/project_settings.cpp +++ b/tools/editor/project_settings.cpp @@ -916,8 +916,8 @@ void ProjectSettings::_translation_res_option_changed() { ERR_FAIL_COND(!remaps.has(key)); - StringArray r = remaps[key]; - ERR_FAIL_INDEX(idx,remaps.size()); + StringArray r = remaps[key]; + ERR_FAIL_INDEX(idx,r.size()); r.set(idx,path+":"+langs[which]); remaps[key]=r; @@ -1095,6 +1095,7 @@ void ProjectSettings::_update_translations() { t2->set_editable(1,true); t2->set_metadata(1,path); int idx = langs.find(locale); + print_line("find "+locale+" at "+itos(idx)); if (idx<0) idx=0;