From e4b4608065bbb5062f7b8cb3d8ded72065608f99 Mon Sep 17 00:00:00 2001 From: JAJames Date: Fri, 1 Jul 2016 18:51:28 -0400 Subject: [PATCH] Merged Translations.ini into RenX.Core.ini --- Configs/RenX.Core.ini | 72 ++++++++++++++++++++++++++++++++-- Release/Plugins/RenX.Core.lib | Bin 206992 -> 206580 bytes RenX.Core/RenX_Core.cpp | 8 +--- RenX.Core/RenX_Core.h | 8 ---- RenX.Core/RenX_Functions.cpp | 52 ++++++++++++------------ RenX.Core/RenX_Tags.cpp | 2 +- Translations.ini | 72 ---------------------------------- 7 files changed, 97 insertions(+), 117 deletions(-) delete mode 100644 Translations.ini diff --git a/Configs/RenX.Core.ini b/Configs/RenX.Core.ini index 8f09a83..c56848a 100644 --- a/Configs/RenX.Core.ini +++ b/Configs/RenX.Core.ini @@ -7,9 +7,8 @@ ; ; Settings: ; Servers=String (Format: Server1 Server2) -; TranslationsFile=String (Default: Translations.ini) ; CommandsFile=String (Default: RenXGameCommands.ini) -; TagDefinitions=String (Default: RenX.Tags) +; TagDefinitions=String (Default: Tags) ; Servers=Server1 Server2 @@ -257,6 +256,73 @@ IRCPrefix=07[Marathon] ; LoseScoreTag=String (Default: {LOSESCORE}; used exclusively for GameOver formats) ; -[RenX.Tags] +[Tags] + +; [Name] +; This section translates names of presets to more human-friendly strings. +; These override the default presets. +; Example: Rx_Vehicle_Artillery=Nod Artillery +; + +[Name] + +; [TeamColor] +; Overrides the color strings for IRC message formatting. +; +; Settings: +; Nod=String (Default: 04) +; GDI=String (Default: 08) +; Other=String (Default: 14) +; + +[TeamColor] + +; [LongTeamName] +; Overrides the long team name translations +; +; Settings: +; Nod=String (Default: Brotherhood of Nod) +; GDI=String (Default: Global Defense Initiative) +; Other=String (Default: Unknown) + +[LongTeamName] + +; [ShortTeamName] +; Overrides the short team name translations +; +; Settings: +; Nod=String (Default: Nod) +; GDI=String (Default: GDI) +; Other=String (Default: Other) + +[ShortTeamName] + +; [WinType] +; This section translates win types into human-readable strings. +; +; Settings: +; Score=String (Default: Domination (High Score)) +; Base=String (Default: Conquest (Base Destruction)) +; Beacon=String (Default: Espionage (Beacon)) +; Tie=String (Default: Draw (Tie)) +; Shutdown=String (Default: Ceasefire (Shutdown)) +; Unknown=String (Default: Aliens (Unknown)) +; + +[WinType] + +; [WinTypePlain] +; This section translates plain win types into human-readable strings. +; +; Settings: +; Score=String (Default: High Score) +; Base=String (Default: Base Destruction) +; Beacon=String (Default: Beacon) +; Tie=String (Default: Tie) +; Shutdown=String (Default: Shutdown) +; Unknown=String (Default: Unknown) +; + +[WinTypePlain] ;EOF \ No newline at end of file diff --git a/Release/Plugins/RenX.Core.lib b/Release/Plugins/RenX.Core.lib index a4a8ee3ccbba2b12129941197a6d5bf9e78a88cd..d6b3d8bbaedbd34522463e5f1ae30612ead79465 100644 GIT binary patch delta 21523 zcmch837n4A+y8aWJ(eu9Fvi%%V2o)RV=RfW%vjQ79g=++l8|LclJHEDBr%NU2x&-~ zBufjDkR)lWNt9)hN@W>KlJ)&w=iKMAV< z?=F=Y5m3K=gSsjwUWR+>HFzMB|4S=DLFO#?yN3z;Zk`X&dW+sxXb&cfo z<|L!LlDu~@$=Fzu_vMj{nM$%I+H0kw?IV&^_F-Hy$*S#12F^1$IFlqJx1zy{P?C(j z3&_Jia(0YC#to8;=MQN(HIhlA`Z{tL)gm?IrQxLU>M)XwznU6c7)+8;xr;%GTO=8i z4{C_p(PWT=XAa3p8$J9(;`$T~S$+^1T*eb1NT~sh2?(BSAfibEPUXc0750(CsItu< zq6;}1`FH{qFB?>vLJp&Hut5b+OAG|c&on5#k{m{f(*}WgGIx%d@Npj2@e^Y8>p z!!nE#eGH0&2OximGdMkkB;)sB7mM%&JioRlsc{%j;5S%+aSG;PoGdUXdyyog1pLjY z(F6W(4&Ng_?hQm->NXq@#RE=9Xu9zak;^b2_zZ8B@DiU#*Ag4VN^a~P^AlkwF~@T8j-94 z2Bm>=(2NlnY2Y~xGXWJ~PDVv&&2ZYfK(IPM2$(Yh(hNM{!3a2I5DxP*Duf#d%q2Yd zkqr%kZ$V-}Zr5-srXgs6D)9#4E6C9Z#}g{$yf;_Zw(o(u8GHuQFg9&ASltUg11>K$m^F_iwt;GqHfIzT@N%3uK#SMn+Bgtra&Y*QN zEC96o!Jr-lVbpDC&=_W9G$4bKV@NWFPBD0JK1oIj+87T<7_`bE33%ia@Hb;fs6lsV zz!>48_AQc(NAnCG?@E#}BHAErD_jT+&NgURktE|0Ov-4CK1SaZgJA_E8KYqFQBm-J zgH;BDK+H(T-;7bG4F|~m-$sMsgGn+T z$TjE*g&2=tF=&$l|MO3OFkmDNGH90wUjt7<6Gm73o6!MgWAtoq&;f2>)CUj7W2r7+ zk;j06n+$p%C&}oOVbB}A7`?LLfBeXa7|fUyZV)=0B%|a6gX);D`a!gvH28K1N;80+ zk48xd#n|55U{wN1jRSZB`*Jm$>R2TKc?H5TUO5T>zXGPOZ8tdIjU?mtA1*M-ZQxd% z!OayU0Y~;R5I>Lu$m_5i;1s)TP;@RifZQFe;S_6*b_jPh*u@8U0xx>P@DoN(IWPs} z(wzoNW{_koZDjCK3`xeibb}-DBpG`q8mxyE8Hd4x@qL8BF(}434(n;O!4voiN-;cd z6G=wia)Z4Ph_Ou?eB2Rh0qhDW{vhKw0|49+E!WSre*Fb_-_S<4JwYY0~X^B@2tE8Jl2B9e?h3tWuD z6WE{Y0zCFdW0y@D@?0L~$%Fs@&eU*%uVIzD1|eE%IAQ&WAIuR~bIKRaEt!4r5HG4rwqKhxnK#!Dd5faWg&3otq3^^FF9 zfPqE~p1`6$1`AhV;{t4qHTYyKNyY~7&}e`s@a8&$m9QG){fY2D|13{1czZfx0r&_3 z#5jOdVdOwC#x0l(a73&D%^(MmH_I5DI75>0BPL=T$~HJL5bePCxdtak;!FV?-HQCj zk35P=7{}muM*a{Nr||@itTgx`o}|VaJb@n}IO8Ww$~X)QFlv*FDR@r7b`3ioK!$a5 zaU9R%*hwu*;U5yWVl-sXEbM@1;omDXoRIOz>t7AdUqNjE3YHn{K8oB14j}*!g?~6a zsBx7KtJeN_kI&({e!a%-;reeuwC#$Z%U1=(T@$pknxq{Ok`gl|U8^Oj`E*HLqjAQ( zS5j=Oq`dniO^rc2_F3uZ{|IgSsz^%4xb{^g%?p$?^Pr@Pxj3J$khEa0q?p-~Ze&P0 z^gQTlIJC}F-J!^84h_E~Y1pfhn*Jqe@C8X-DoeUmLejy>lA>=5$^kY`k~HPIph4v& zT?RtUftMx+gGNBG$`0+T;Lx@z4t0reC?B|7(V;1o912EXOZ3ew@6gK94xKLHP+p)z zo?bx?{R$K><$ z&>l5l30PzYtPuzc<-<~YV1-%H4n+Y4Ar5VtCTaRqjC%`XP`v_nNDt*7kksp%q*K72 zuOyAxDQV)DAlM;k`HPY!+>lfP8U}xdwq=qIz%pH6=GfBc2YQr~6bVzG_DEV;0YX%i z)YgHCfvF*q(gHw(zEgNk36~TOn&q%oLkSB9qhmY%kp?rx!)z(ch1A`zmCL9N!cC7?=0auGbiQh<%dgqkWYJ0kL%o{&)d?k8c9s1@W-wFKB*I(ykhajVNdc z^ia@tHO8%l`RAY?Rx7hm(!lpH=3CH(!j)wmI$6e{GdYsxz5|+-QXhHxeS?7BCFv;8 zEl!fBeWaumMES2XCG`WwuK{x~m~unV4Fp@%O*|#6^Co-;Ed~~qbg~Fy0GMzFV<5nG z@EB6Wp%Uxy?*NDPd<^qv!;O&+jR|%rr=~*^h=>0heF#gui#fKyB^%-Yqo2YLn7OZmx8p9HNiZ}`(Ccw-+c#?Z0{Q+~AK@f(eNgCb_ zf7eAyj+S($H3V%WsX;0PPXwC6Wlg{bIF7c{UEu%3F3_wqd@@GTJp*5kLv&7% zl=>_pe>|*%wxv(Q++z`7z%I}(i-%wdps9m)Ag~|&k1@puq7Dp^bgreOWC-v>JMgH7 zfP+wF8cU)Eh>wv7#-VV#=Ry3Dg2^97O0|OKPav-`cvp8|1T0e2hT)kz3xdoF=0UmObVK=c&5~c#U6toz@~xl|MA{Pl|CTEGrJcE zCL#_d!H=O}RuTiN!>qtb{5|Abn7kAiqP_Wc2)7FL0La~k@u;LXu7K_p1mSD2 zOMeab0?}Vcs=gL3@j#2IjzjI=f<#E6rRYe7276{mNFedYFELcdpmf+DZ%%SSw5reeMT?{(l#v+V)L(<5qsQ*{+ z)9`gkJO6dftzefh*3Oz?dK5|LjAEQv8t%Q;s}|h(3xzKr+la zBp<;AtULnK{~&1%knkf0!_2WTKh;Kb14B^hx`iR9fn_LIF}DQG3W5N5j>p3DEBt*0 z@vy7_wPQCdh&jJZZoToBPzi{hv@)u9RW98IDz^b|c!&(JRVns(Cf z^astMxpbD!&^hWzQ8Z8t5l@IGX*i9m>1e~22QgeWCSi;^NtT%dBIy9gI`L?dypXeio= z%T!+6C$7*{`iK6e2SsC%C{jfe(Nwe)twb3SAGCTF8-tg^e!!=PsJBvn^;9(i5+6S*dW%4kHrqk z6W@xDXo`42JTDfBUNnSei+y6Rm?u7_Fq%(Cs64$+p4GIDc8fh?n0QkBOe<(By)NFP z*Ti9(D)x&kv7cTPduh7(M(h$_i=E;}I!Y($CptmL=m*ND<1|xVPoW$yO7kf1KVjG2|CsClmg=7Wv0VR#{_oj-cd~o_r?UOxe=pw) zr+aYWd|yAbr0CI6Ve|CJ`i{Ls>j_!Sc097a=67O!b#rRZ|64@g)A!Q2?m;-O7gsH= ziAw8ZucBOfyTeq>H4!ZPURs}c4NIy|d)jpoT!hDdubN#GRTainQme0vvxX+4n2g0R zm3Kq5H7#p$WqH*%6K4)Ix49|0ndY3E!VumRV{}V)F{b;+(2cw$QVm_|e#7wGEz#A7 z?zSjflBK9ignAN?Rqbk&%D+bjs!`=+`8#wcEZu#eD+;>(e^*l2`o6UWwgCZ@ zl{~zvN)GUKfnsi&C>BKFOmsWBvZ``h1ZLk9VTMuWJw~Wa_sA5}QV`_CYUj4ZsEQPz zl7htjYHJS}W%{*5YfBi3c9f8V-R6>pQJ<2srD<{9tM-(1mC-TAF~PBzQcAYhblG99 zrE6los;W~dD10N>#z^FD!#1(B9BbIZh1#&kOS@Bh*=m1rs8v^^gJe0C8R+$wi8NIZ zXzl77YHC=JjWz3l<3YYM+q~!z>^jOjC2Mjx*wsXNnQHshfFv=nU)>N9raFYlnnqnW zMR$f+r`zC5DPx1r2GgE0KEV{k?oI&DICwHCsjjLPAX^!e_&K^ZJ9iyqiyuH z4|StYCAc2j6~2OtgKaH!mU+oHm?f**KBTH!Dh3Kkh}^uICa{4u1Qn1 zT0yKtRHKXs8mdat3dM1+BZ%X^iJDzW-lt}j6{S?^ioSN#tY%j=6=ZrPD~ey84X^CV z>{nG6SGFFvzKEz&s1huyawovFWh+P6G3gP;LW?4-|7_}3tZGx&uPU@gWzKs3(W>gx zs#ZlmA%i2WVI#jVtg|C!7vn}dS$H+y$+S;nV4W0ZJ>b!b%=%7<`6WeQb(<8JRI4(h zx^->Z4{pZeeJ-_AbE?ZQRi}o0z|76`dZq`^+n#3%*>tb^th!Z#M|03cM7haf((ZPY zEUSlA!?2EeSZrCfCCU!dk;z0nHngSJ=&_F zBf+jE!L@AkX(K0XFdP@xl6}m08@;hHej#JmwT&@06*xJxB8gC>J1f#TI8H_0XX~#` zo;~;45q=@rBi8cgC5$CL9cyLqW8E99)$NzWzwy3xpC50lcs zYf-kPXLhf5nkwgwlONBiCY1C zgK8*>M%u?!RAgOIJ1g?#0M)F44KD~%UQKG?R+uM1JWLb!D$Fo}Rg36tRBL;`oNPo& z{=kTR^?tj=YmU!1G;x&OP%d_DFwsq(r!mJ!Rkx80&DxjMt?)E@bh$=mbZjFz-)q70 z>KK}JReusJ(jn%#_xlwd4>7fuRyDQ~+Lk_vw#6F1L=$U#widf=WfSW%tuC8dmsU3Q z(<-EytgrH$*sA4a)6B9#KpQsAyak-iTf4a{_Xw~V54k75n^stEt@or!TJP*6nd77O zr%A>d`;z1;)2z2Lqpq0dRmpOg4|V@fO>;^MIipasR%IAun4~(jka22FE7`(lN7d2@ zzp161PxBy_@>Yr!-g<-EN5*iwXeM`d)l!<9gGp9I>>2eC?pG4 z=iWEz^g{ct)9aPLGW{8^&JPI9JC^G}`J=z0$G&%s_NGfIq9BU1e` z{QXpyXgG-G8lwADZ--wRXpV8LeaT!7H|>NR9!$dA5>Y#=C$@QrnXx8qsD4eAC+@` z?9li*W3@Kje6pvIdlo`-T&1>BTSxkcdZ(_f>u%-E8D^Y4sE2jG-`t@+?c6ph4)wHA zp|g{HsH37CG|53!qilV!@MQf4cfe6 zK0&Li*u*Ej9N}ypl{j2xyV+w#Wsk6ftaNKe_(&J73Kp38(ns1TWbLv?xe?GEHrWj4 z2GtjB3x^^X44!n;C@ZRt9$WuLrrY|bnDor$VvytZNXq$<) z=xiKglh_9Bkf*G7wLNb?<>uxf@c$A))7;Zt9V~Avf;X^P;+*KV@s2t3M0o`6*RS7EE1lzi^bhi?}pU-p6l*Y$E+|+NsV!D_io1?Xkt=+bmy$1-=ExW1MxW-t z+~yKfWv);2?y0h@-fq1KNsg(IsWK`nIjm_`aGM6|)u~<++FLzcR9NWau;bjgI;!L} zOJgmRHqBbd9!v|S`JL!yuQ39Sf5{$p?4?lA>Gt->9<4H_+oP2|)s%YKo@)GTGyP?+ zZQSi$;0#;Dw6$KJVP;)5!){LP95Y|BbMRS88>1dH{9P@XDXXdEnKIVcEB!Z98y3v8 zM^-CS+^aq^>H3lTs#V#ZrW0n_FkwF0`7JQZIXHiRvS^^{T=5$6mfQaj`p+YrTRfcT z)2##OdW5+jIX>I25?*U)7u}Dc7uZGRYNeWTwl4{p|9rt`P zD6VcVlF91q8}eS`b*-2^2DMpiS17-`uo41gHT^`ztl*2F$ddE-^< z#PN#vFe zC+&wxLqtGU=Uwqxb#~S8u_f0sO_BtXGMc2G`s^+1MO*sIEVCZ68{h0@-Yti3t|Y!~ zL(7(oJ#X8RVQ*&JF1IBk;hbBBdSLc&_53@sLe}Cl4YD`b{IRR|gm=8Fx4WT=%e5=K zHQmu%%T`;-Z%a`bnkAR*u2${xa^}+>@0B@E!dKWWg}p02yuwylt8l;fyb5z9oqNx{ z^XUoEBRMFxv}y;zeb+P_gezD21|e_Hc+y_)%kd`e^wxuSUfL5+fng0q$d-0uaN#mx zLx0CA8~V^y2hN1mc7topTzQSx9_%5z7%f}lR}<|0bG@~8F|$Q(+ge-XY~~LCz#Cca z>#!0Z+ELo(FMenW>4FdC2Dgy%wq?Xe?j}74s?~(0wjJamuj zBx?At2*#ywXX6j)poNtL}NeoyCJHu z$(S>KlicZJ&XCVcbM$BO1GjKtA?1)NzS%Bde!JP6&3?Pt4qMz^WHwZ725X0O6&2Ns zTV$5cBzAL^vej;`yhTQvsRPC)aoDE~NK(&zZVQH1hi?U0oPD3$(~&*D%-m)Z%`SND zzp!=E`fJY@uD^5%v@iM6x7#vei~X7Hw%FT|)4%ldw7s;6-C+s2ROmS47Xm4Wqu_*C z_0JAhcpE|;zp^1@_Y3$I+r4|&`q@KaubuV?XNyGm*S1JlnKpfGWx~)qC$@gOTtZXl z?b~gB3*HHG)jbfU>U`s4RI^*-eSNB`ohNH#b?U0ixNo_!CXLRsCiR;#H_ysurES0a zju1M23U*t~wVs#uxLfAOG4G=)Xs`6R5rUnkwqqxBbc4JF*IE{?eSB@kxu)sbg04Fv zZB{SQ>`ry()kUwy_0io!-QFiV82;R$$8kqbj62^;M637qTZ8C~<#z@;6dQx67l&e# z*7x}k@!m#r=e!Lw;9X# z9a^$S(a{f@uRWVm_=Lp;SPRw&H2t}hgnTbz)!Ak~Z@83qbE~Im4azjt`8(OyHL$MO zcr~c`B%^l#E9mJ|Pc3d_h2-s%mW5w_4TP0u_Yt+!;zPEd_bvJhkJ@VVAz4Y?9#`V9wH|AyJ6OBH%5zwDHY4tK$`dSe=iT=e zuA+Vp7^3DJk?k}KPC)Ow>7f{$H1w&gC4W`r@$P*N>#S|UIuB#p1|LCa+#z74wNY5^ zCt;NQz9RD91khY~y&2A21{@Jlcer?yQWJ4fj$l=8U#?Mz6HBaT05 z+9dqRj5Zi={YI$@$7CmCFu(9mS8pD(;m?~8&9xy$j0V@vm+tiw&X|Db9K&)YT&jMj zTlpo=Q?S6Te#SyRe)lS<1!D!rs`pR0ZZNUQZ|Za}AA+A&b@F9*BesrQ-c9J<=I9-# zKJ)f^qd+Ubsrd{P2)P)iRvz|^JS~CWS3Tn)>c0LW;%*b0&x!POb-?gh)%m1+*hWmD z&IxM2?Nl5rdK3rCbE@;tu7SPUYZ+PliI8#2UpfN*%}U-dn8dM?d=%I7g*FCWwe@_g z_GESBluahyW$VD^UA6~2IIy2@dap`5ZO`1Ws`2WBAj#lq_8%1w6gpw>F#(@7;f=7C zoVO~^!)oyZ1YW%Ooki~WP|MCfoWe|7920d4lX9`sR9x&{0995*v-*XJyfbS`o_Q+s zTYU_hq(W2ks;SMuA3VLNK0hrVHId`jF->*&-FEnWDD)D1k=pEj=4vl-?fzBI%@H@9 zrQ8yo;6udBwN-f5m%-y)wAR!X4&Uw>JVh`-DW!0?6pUM{A%k$w!E5wJN*#d9p7x!wb z)|~TdZ4azkD?YGhLhRAU^o^dYm0z`+gHVVZgldQT2cIZbewLYQh$>r&d@B{NsHOSa zAdcTGm^ewD4|m*ZMd`kFd%!J5gt5!Kchqkg;~8)t2~R!`x7 zC$#Rh=PAvgCm1Nz>5_cP*qN_%bw_`6%vb+hlFxcQW8Um*`}9HY>#)z7VV%?)mwZ>+ z1Z<8q3Ewg;07-hd?=6#eTdM`^pgR90E2|klW5M>hsJd%2vqxVQ zX6;x0`sWP})Y%pEt(Omto|Lbh^rR`O+TXledcsWVL&sG?E6-KoP1WhD>~ECUMcD5% zq#QVQ?-Qb->Y(oIXH9X`(s1Qm!YO<1l&DrXWqG%%srW75QkFUMtJXf(1m5X15r6gc zmLaN^m9R6^=Wf(*Xa1<6mNW9 zs!dl%CEbuURR1Q}zWLuMdyBjlnTvcbi#%X^jl#-n<@mBsTbj3G@2b5w?N-b$d{#iL zg+oPR;VqxnpPEGqSiGmM-;x82v)Cv)0(rZ!5-b9T;ds08wl@J#e6%*5)a={PCgV4B z7rM6RQ;*i9J$S5QO_I;!jh*);v7g~rtIonPdn(0w>oV^koPTG|G@3bAzqMeFg-Nt1 zECOeu=G0$}l1|O6Md#}mCh^nsL*&SSFRG|?;l#O7dq916w zkA6NwoP>-NcYXEaU0$?6T&Xv!swJIrYSKtiA-jy@Tlsn4p*@zQ=9F+MWCb^=T8P50 zz-(2kOFC|W@virJLE!cNbEuc3>Q-{x{k~2czg^-swZD|(?h^gd{0r5;wBx3^m$8W_Nb3k#L8B-$J?z>@#ZA@$c0-v4r2Ky&+a~zlhEQS9Rf> zh`lq=?_Pg5_g6cQRs7EWM}JxPSy{J0)dKrHYCu`1g^59LuhyJ<_abyUjmDkMs8D;q z%wJGz;qFEMKGiwYaXT?_T<&tHdVE~7zrQ0)(MUNKzwHd8a;PX)e%(EG=TZtBnSR%pLf z=@7dk{+REosm?&8JFhY z)jc&F_eRCf&3|BY;4^o-+4ptgpP)&42LEdgUK9E33H`2Y&Zsw|>;&+fiQ5O&!YC&p z>-a-~K6_Z>S6EsLmki;~sVy~~o^C?lwQQbOoucis$=BXm@s1c)0I}+fH`@c(i+(pz z7tlXyJhsJmmTZ)$FjY{?3Dt8~0F#TVbc|Eq%&mKS#W VQJ2R@_K0saYRu#DgN6^M{{kBRzCr*1 delta 21553 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 diff --git a/RenX.Core/RenX_Core.cpp b/RenX.Core/RenX_Core.cpp index c2a8f7c..395437e 100644 --- a/RenX.Core/RenX_Core.cpp +++ b/RenX.Core/RenX_Core.cpp @@ -43,10 +43,9 @@ bool RenX::Core::initialize() RenX::banDatabase->initialize(); RenX::exemptionDatabase->initialize(); RenX::tags->initialize(); + RenX::initTranslations(this->config); const Jupiter::ReadableString &serverList = this->config.get(Jupiter::ReferenceString::empty, STRING_LITERAL_AS_REFERENCE("Servers")); - RenX::Core::translationsFile.readFile(this->config.get(Jupiter::ReferenceString::empty, STRING_LITERAL_AS_REFERENCE("TranslationsFile"), STRING_LITERAL_AS_REFERENCE("Translations.ini"))); - RenX::initTranslations(RenX::Core::translationsFile); RenX::Core::commandsFile.readFile(this->config.get(Jupiter::ReferenceString::empty, STRING_LITERAL_AS_REFERENCE("CommandsFile"), STRING_LITERAL_AS_REFERENCE("RenXGameCommands.ini"))); unsigned int wc = serverList.wordCount(WHITESPACE); @@ -152,11 +151,6 @@ Jupiter::ArrayList *RenX::Core::getPlugins() return &(RenX::Core::plugins); } -Jupiter::INIFile &RenX::Core::getTranslationsFile() -{ - return RenX::Core::translationsFile; -} - Jupiter::INIFile &RenX::Core::getCommandsFile() { return RenX::Core::commandsFile; diff --git a/RenX.Core/RenX_Core.h b/RenX.Core/RenX_Core.h index d9fd189..a26e8c9 100644 --- a/RenX.Core/RenX_Core.h +++ b/RenX.Core/RenX_Core.h @@ -150,13 +150,6 @@ namespace RenX */ Jupiter::ArrayList *getPlugins(); - /** - * @brief Fetches the translations override file. - * - * @return INIFile containing translations overrides. - */ - Jupiter::INIFile &getTranslationsFile(); - /** * @brief Fetches the commands settings file. * @@ -191,7 +184,6 @@ namespace RenX /** Inaccessible private members */ Jupiter::ArrayList servers; Jupiter::ArrayList plugins; - Jupiter::INIFile translationsFile; Jupiter::INIFile commandsFile; }; diff --git a/RenX.Core/RenX_Functions.cpp b/RenX.Core/RenX_Functions.cpp index 0cd81a3..be73a69 100644 --- a/RenX.Core/RenX_Functions.cpp +++ b/RenX.Core/RenX_Functions.cpp @@ -492,7 +492,7 @@ const Jupiter::ReferenceString RenX::translateName(const Jupiter::ReadableString if (obj.isEmpty()) return Jupiter::ReferenceString::empty; - Jupiter::ReferenceString iniTranslation = RenX::getCore()->getTranslationsFile().get(STRING_LITERAL_AS_REFERENCE("Name"), obj); + Jupiter::ReferenceString iniTranslation = RenX::getCore()->getConfig().get(STRING_LITERAL_AS_REFERENCE("Name"), obj); if (iniTranslation.isNotEmpty()) return iniTranslation; @@ -837,31 +837,31 @@ const Jupiter::ReadableString &RenX::translateWinTypePlain(RenX::WinType winType void RenX::initTranslations(Jupiter::INIFile &translationsFile) { - NodColor = translationsFile.get(STRING_LITERAL_AS_REFERENCE("TeamColor"), STRING_LITERAL_AS_REFERENCE("Nod"), STRING_LITERAL_AS_REFERENCE("04")); - GDIColor = translationsFile.get(STRING_LITERAL_AS_REFERENCE("TeamColor"), STRING_LITERAL_AS_REFERENCE("GDI"), STRING_LITERAL_AS_REFERENCE("08")); - OtherColor = translationsFile.get(STRING_LITERAL_AS_REFERENCE("TeamColor"), STRING_LITERAL_AS_REFERENCE("Other"), STRING_LITERAL_AS_REFERENCE("14")); - - NodShortName = translationsFile.get(STRING_LITERAL_AS_REFERENCE("ShortTeamName"), STRING_LITERAL_AS_REFERENCE("Nod"), STRING_LITERAL_AS_REFERENCE("Nod")); - GDIShortName = translationsFile.get(STRING_LITERAL_AS_REFERENCE("ShortTeamName"), STRING_LITERAL_AS_REFERENCE("GDI"), STRING_LITERAL_AS_REFERENCE("GDI")); - OtherShortName = translationsFile.get(STRING_LITERAL_AS_REFERENCE("ShortTeamName"), STRING_LITERAL_AS_REFERENCE("Other"), STRING_LITERAL_AS_REFERENCE("N/A")); - NodLongName = translationsFile.get(STRING_LITERAL_AS_REFERENCE("LongTeamName"), STRING_LITERAL_AS_REFERENCE("Nod"), STRING_LITERAL_AS_REFERENCE("Brotherhood of Nod")); - GDILongName = translationsFile.get(STRING_LITERAL_AS_REFERENCE("LongTeamName"), STRING_LITERAL_AS_REFERENCE("GDI"), STRING_LITERAL_AS_REFERENCE("Global Defense Initiative")); - OtherLongName = translationsFile.get(STRING_LITERAL_AS_REFERENCE("LongTeamName"), STRING_LITERAL_AS_REFERENCE("Other"), STRING_LITERAL_AS_REFERENCE("Unknown")); - - scoreWinTypeTranslation = translationsFile.get(STRING_LITERAL_AS_REFERENCE("WinType"), STRING_LITERAL_AS_REFERENCE("Score"), STRING_LITERAL_AS_REFERENCE("Domination (High Score)")); - baseWinTypeTranslation = translationsFile.get(STRING_LITERAL_AS_REFERENCE("WinType"), STRING_LITERAL_AS_REFERENCE("Base"), STRING_LITERAL_AS_REFERENCE("Conquest (Base Destruction)")); - beaconWinTypeTranslation = translationsFile.get(STRING_LITERAL_AS_REFERENCE("WinType"), STRING_LITERAL_AS_REFERENCE("Beacon"), STRING_LITERAL_AS_REFERENCE("Espionage (Beacon)")); - tieWinTypeTranslation = translationsFile.get(STRING_LITERAL_AS_REFERENCE("WinType"), STRING_LITERAL_AS_REFERENCE("Tie"), STRING_LITERAL_AS_REFERENCE("Draw (Tie)")); - shutdownWinTypeTranslation = translationsFile.get(STRING_LITERAL_AS_REFERENCE("WinType"), STRING_LITERAL_AS_REFERENCE("Shutdown"), STRING_LITERAL_AS_REFERENCE("Ceasefire (Shutdown)")); - surrenderWinTypeTranslation = translationsFile.get(STRING_LITERAL_AS_REFERENCE("WinType"), STRING_LITERAL_AS_REFERENCE("Surrender"), STRING_LITERAL_AS_REFERENCE("Forfeit (Surrender)")); - unknownWinTypeTranslation = translationsFile.get(STRING_LITERAL_AS_REFERENCE("WinType"), STRING_LITERAL_AS_REFERENCE("Unknown"), STRING_LITERAL_AS_REFERENCE("Aliens (Unknown)")); - - scoreWinTypePlainTranslation = translationsFile.get(STRING_LITERAL_AS_REFERENCE("WinTypePlain"), STRING_LITERAL_AS_REFERENCE("Score"), STRING_LITERAL_AS_REFERENCE("High Score")); - baseWinTypePlainTranslation = translationsFile.get(STRING_LITERAL_AS_REFERENCE("WinTypePlain"), STRING_LITERAL_AS_REFERENCE("Base"), STRING_LITERAL_AS_REFERENCE("Base Destruction")); - beaconWinTypePlainTranslation = translationsFile.get(STRING_LITERAL_AS_REFERENCE("WinTypePlain"), STRING_LITERAL_AS_REFERENCE("Beacon"), STRING_LITERAL_AS_REFERENCE("Beacon")); - tieWinTypePlainTranslation = translationsFile.get(STRING_LITERAL_AS_REFERENCE("WinTypePlain"), STRING_LITERAL_AS_REFERENCE("Tie"), STRING_LITERAL_AS_REFERENCE("Tie")); - shutdownWinTypePlainTranslation = translationsFile.get(STRING_LITERAL_AS_REFERENCE("WinTypePlain"), STRING_LITERAL_AS_REFERENCE("Shutdown"), STRING_LITERAL_AS_REFERENCE("Shutdown")); - unknownWinTypePlainTranslation = translationsFile.get(STRING_LITERAL_AS_REFERENCE("WinTypePlain"), STRING_LITERAL_AS_REFERENCE("Unknown"), STRING_LITERAL_AS_REFERENCE("Unknown")); + NodColor = translationsFile.get("TeamColor"_jrs, "Nod"_jrs, "04"_jrs); + GDIColor = translationsFile.get("TeamColor"_jrs, "GDI"_jrs, "08"_jrs); + OtherColor = translationsFile.get("TeamColor"_jrs, "Other"_jrs, "14"_jrs); + + NodShortName = translationsFile.get("ShortTeamName"_jrs, "Nod"_jrs, "Nod"_jrs); + GDIShortName = translationsFile.get("ShortTeamName"_jrs, "GDI"_jrs, "GDI"_jrs); + OtherShortName = translationsFile.get("ShortTeamName"_jrs, "Other"_jrs, "N/A"_jrs); + NodLongName = translationsFile.get("LongTeamName"_jrs, "Nod"_jrs, "Brotherhood of Nod"_jrs); + GDILongName = translationsFile.get("LongTeamName"_jrs, "GDI"_jrs, "Global Defense Initiative"_jrs); + OtherLongName = translationsFile.get("LongTeamName"_jrs, "Other"_jrs, "Unknown"_jrs); + + scoreWinTypeTranslation = translationsFile.get("WinType"_jrs, "Score"_jrs, "Domination (High Score)"_jrs); + baseWinTypeTranslation = translationsFile.get("WinType"_jrs, "Base"_jrs, "Conquest (Base Destruction)"_jrs); + beaconWinTypeTranslation = translationsFile.get("WinType"_jrs, "Beacon"_jrs, "Espionage (Beacon)"_jrs); + tieWinTypeTranslation = translationsFile.get("WinType"_jrs, "Tie"_jrs, "Draw (Tie)"_jrs); + shutdownWinTypeTranslation = translationsFile.get("WinType"_jrs, "Shutdown"_jrs, "Ceasefire (Shutdown)"_jrs); + surrenderWinTypeTranslation = translationsFile.get("WinType"_jrs, "Surrender"_jrs, "Forfeit (Surrender)"_jrs); + unknownWinTypeTranslation = translationsFile.get("WinType"_jrs, "Unknown"_jrs, "Aliens (Unknown)"_jrs); + + scoreWinTypePlainTranslation = translationsFile.get("WinTypePlain"_jrs, "Score"_jrs, "High Score"_jrs); + baseWinTypePlainTranslation = translationsFile.get("WinTypePlain"_jrs, "Base"_jrs, "Base Destruction"_jrs); + beaconWinTypePlainTranslation = translationsFile.get("WinTypePlain"_jrs, "Beacon"_jrs, "Beacon"_jrs); + tieWinTypePlainTranslation = translationsFile.get("WinTypePlain"_jrs, "Tie"_jrs, "Tie"_jrs); + shutdownWinTypePlainTranslation = translationsFile.get("WinTypePlain"_jrs, "Shutdown"_jrs, "Shutdown"_jrs); + unknownWinTypePlainTranslation = translationsFile.get("WinTypePlain"_jrs, "Unknown"_jrs, "Unknown"_jrs); } Jupiter::String RenX::getFormattedPlayerName(const RenX::PlayerInfo *player) diff --git a/RenX.Core/RenX_Tags.cpp b/RenX.Core/RenX_Tags.cpp index 76e2d93..ab8d335 100644 --- a/RenX.Core/RenX_Tags.cpp +++ b/RenX.Core/RenX_Tags.cpp @@ -54,7 +54,7 @@ bool TagsImp::initialize() this->uniqueTag = "\0\0\0\0\0\0"_jrs; const Jupiter::INIFile &config = RenX::getCore()->getConfig(); - const Jupiter::ReadableString &configSection = config.get(Jupiter::ReferenceString::empty, "TagDefinitions"_jrs, "RenX.Tags"_jrs); + const Jupiter::ReadableString &configSection = config.get(Jupiter::ReferenceString::empty, "TagDefinitions"_jrs, "Tags"_jrs); TagsImp::bar_width = config.getInt(configSection, "BarWidth"_jrs, 19); diff --git a/Translations.ini b/Translations.ini deleted file mode 100644 index ea88239..0000000 --- a/Translations.ini +++ /dev/null @@ -1,72 +0,0 @@ -; Translations.ini -; The name of this file can be specified in the primary configuration file -; as "TranslationsFile" under "RenX". -; -; [Name] -; This section translates names of presets to more human-friendly strings. -; These override the default presets. -; Example: Rx_Vehicle_Artillery=Nod Artillery -; - -[Name] - -; [TeamColor] -; Overrides the color strings for IRC message formatting. -; -; Settings: -; Nod=String (Default: 04) -; GDI=String (Default: 08) -; Other=String (Default: 14) -; - -[TeamColor] - -; [LongTeamName] -; Overrides the long team name translations -; -; Settings: -; Nod=String (Default: Brotherhood of Nod) -; GDI=String (Default: Global Defense Initiative) -; Other=String (Default: Unknown) - -[LongTeamName] - -; [ShortTeamName] -; Overrides the short team name translations -; -; Settings: -; Nod=String (Default: Nod) -; GDI=String (Default: GDI) -; Other=String (Default: Other) - -[ShortTeamName] - -; [WinType] -; This section translates win types into human-readable strings. -; -; Settings: -; Score=String (Default: Domination (High Score)) -; Base=String (Default: Conquest (Base Destruction)) -; Beacon=String (Default: Espionage (Beacon)) -; Tie=String (Default: Draw (Tie)) -; Shutdown=String (Default: Ceasefire (Shutdown)) -; Unknown=String (Default: Aliens (Unknown)) -; - -[WinType] - -; [WinTypePlain] -; This section translates plain win types into human-readable strings. -; -; Settings: -; Score=String (Default: High Score) -; Base=String (Default: Base Destruction) -; Beacon=String (Default: Beacon) -; Tie=String (Default: Tie) -; Shutdown=String (Default: Shutdown) -; Unknown=String (Default: Unknown) -; - -[WinTypePlain] - -; EOF \ No newline at end of file