From fb62fff91231a432d0feda213e4abc25e93d1848 Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 11 Jul 2023 13:08:54 +0200 Subject: [PATCH] Simplification --- .../main/java/eu/faircode/email/DeepL.java | 30 +++++++++++++++++- .../main/resExtra/drawable/language_bg.png | Bin 113 -> 0 bytes .../main/resExtra/drawable/language_cs.png | Bin 281 -> 0 bytes .../main/resExtra/drawable/language_da.png | Bin 114 -> 0 bytes .../main/resExtra/drawable/language_de.png | Bin 111 -> 0 bytes .../main/resExtra/drawable/language_el.png | Bin 144 -> 0 bytes .../main/resExtra/drawable/language_en_gb.png | Bin 626 -> 0 bytes .../main/resExtra/drawable/language_en_us.png | Bin 144 -> 0 bytes .../main/resExtra/drawable/language_es.png | Bin 312 -> 0 bytes .../main/resExtra/drawable/language_et.png | Bin 112 -> 0 bytes .../main/resExtra/drawable/language_fi.png | Bin 111 -> 0 bytes .../main/resExtra/drawable/language_fr.png | Bin 110 -> 0 bytes .../main/resExtra/drawable/language_hu.png | Bin 114 -> 0 bytes .../main/resExtra/drawable/language_id.png | Bin 107 -> 0 bytes .../main/resExtra/drawable/language_it.png | Bin 110 -> 0 bytes .../main/resExtra/drawable/language_ja.png | Bin 191 -> 0 bytes .../main/resExtra/drawable/language_ko.png | Bin 655 -> 0 bytes .../main/resExtra/drawable/language_lt.png | Bin 117 -> 0 bytes .../main/resExtra/drawable/language_lv.png | Bin 110 -> 0 bytes .../main/resExtra/drawable/language_nb.png | Bin 133 -> 0 bytes .../main/resExtra/drawable/language_nl.png | Bin 114 -> 0 bytes .../main/resExtra/drawable/language_pl.png | Bin 111 -> 0 bytes .../main/resExtra/drawable/language_pt_br.png | Bin 797 -> 0 bytes .../main/resExtra/drawable/language_pt_pt.png | Bin 474 -> 0 bytes .../main/resExtra/drawable/language_ro.png | Bin 113 -> 0 bytes .../main/resExtra/drawable/language_ru.png | Bin 108 -> 0 bytes .../main/resExtra/drawable/language_sk.png | Bin 259 -> 0 bytes .../main/resExtra/drawable/language_sl.png | Bin 221 -> 0 bytes .../main/resExtra/drawable/language_sv.png | Bin 118 -> 0 bytes .../main/resExtra/drawable/language_tr.png | Bin 273 -> 0 bytes .../main/resExtra/drawable/language_uk.png | Bin 111 -> 0 bytes .../main/resExtra/drawable/language_zh.png | Bin 350 -> 0 bytes 32 files changed, 29 insertions(+), 1 deletion(-) delete mode 100644 app/src/main/resExtra/drawable/language_bg.png delete mode 100644 app/src/main/resExtra/drawable/language_cs.png delete mode 100644 app/src/main/resExtra/drawable/language_da.png delete mode 100644 app/src/main/resExtra/drawable/language_de.png delete mode 100644 app/src/main/resExtra/drawable/language_el.png delete mode 100644 app/src/main/resExtra/drawable/language_en_gb.png delete mode 100644 app/src/main/resExtra/drawable/language_en_us.png delete mode 100644 app/src/main/resExtra/drawable/language_es.png delete mode 100644 app/src/main/resExtra/drawable/language_et.png delete mode 100644 app/src/main/resExtra/drawable/language_fi.png delete mode 100644 app/src/main/resExtra/drawable/language_fr.png delete mode 100644 app/src/main/resExtra/drawable/language_hu.png delete mode 100644 app/src/main/resExtra/drawable/language_id.png delete mode 100644 app/src/main/resExtra/drawable/language_it.png delete mode 100644 app/src/main/resExtra/drawable/language_ja.png delete mode 100644 app/src/main/resExtra/drawable/language_ko.png delete mode 100644 app/src/main/resExtra/drawable/language_lt.png delete mode 100644 app/src/main/resExtra/drawable/language_lv.png delete mode 100644 app/src/main/resExtra/drawable/language_nb.png delete mode 100644 app/src/main/resExtra/drawable/language_nl.png delete mode 100644 app/src/main/resExtra/drawable/language_pl.png delete mode 100644 app/src/main/resExtra/drawable/language_pt_br.png delete mode 100644 app/src/main/resExtra/drawable/language_pt_pt.png delete mode 100644 app/src/main/resExtra/drawable/language_ro.png delete mode 100644 app/src/main/resExtra/drawable/language_ru.png delete mode 100644 app/src/main/resExtra/drawable/language_sk.png delete mode 100644 app/src/main/resExtra/drawable/language_sl.png delete mode 100644 app/src/main/resExtra/drawable/language_sv.png delete mode 100644 app/src/main/resExtra/drawable/language_tr.png delete mode 100644 app/src/main/resExtra/drawable/language_uk.png delete mode 100644 app/src/main/resExtra/drawable/language_zh.png diff --git a/app/src/main/java/eu/faircode/email/DeepL.java b/app/src/main/java/eu/faircode/email/DeepL.java index 683db6af6e..5fd73cb633 100644 --- a/app/src/main/java/eu/faircode/email/DeepL.java +++ b/app/src/main/java/eu/faircode/email/DeepL.java @@ -116,7 +116,35 @@ public class DeepL { int frequency = prefs.getInt("translated_" + target, 0); - String resname = "language_" + target.toLowerCase().replace('-', '_'); + String flag; + if ("CS".equals(target)) + flag = "CZ"; + else if ("DA".equals(target)) + flag = "DK"; + else if ("EL".equals(target)) + flag = "GR"; + else if ("ET".equals(target)) + flag = "EE"; + else if ("JA".equals(target)) + flag = "JP"; + else if ("KO".equals(target)) + flag = "KR"; + else if ("NB".equals(target)) + flag = "NO"; + else if ("SL".equals(target)) + flag = "SI"; + else if ("SV".equals(target)) + flag = "SE"; + else if ("UK".equals(target)) + flag = "UA"; + else if ("ZH".equals(target)) + flag = "CN"; + else { + String[] t = target.split("-"); + flag = t[t.length - 1]; + } + + String resname = "flag_" + flag.toLowerCase(); int resid = res.getIdentifier(resname, "drawable", pkg); languages.add(new Language(name, target, formality, diff --git a/app/src/main/resExtra/drawable/language_bg.png b/app/src/main/resExtra/drawable/language_bg.png deleted file mode 100644 index b24e1e21e168185d128b90db24f1d52baf6da809..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 113 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gj7M?DSAs(H{KmPx>XVx|J<&}>U zyTH{GWe}m0Fk{;H`C=7UnjBLOnwl>BzvaMUu^tufj81o5g$_nrHU~z3g;NGVGZ;Kw L{an^LB{Ts5r9mNj diff --git a/app/src/main/resExtra/drawable/language_cs.png b/app/src/main/resExtra/drawable/language_cs.png deleted file mode 100644 index 82ce85ce09835b5144d1676a37fc2e49f11d2fcb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 281 zcmV+!0p|XRP)hp(Yf~jmv2A+(*Qs$5Ol5kZyZ12|M^=_X=ecli+eWypS0=-?JR)d zkg7%hUw`;QI}1QqJ-qAx{{@-p diff --git a/app/src/main/resExtra/drawable/language_da.png b/app/src/main/resExtra/drawable/language_da.png deleted file mode 100644 index cb7bff7c92c45e844112985ee9450b05048af967..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 114 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjmYyz-As)w*fBgS%&#Y^Bcm=CV zMa!E(kSK0vf{L M>FVdQ&MBb@00E#PVE_OC diff --git a/app/src/main/resExtra/drawable/language_de.png b/app/src/main/resExtra/drawable/language_de.png deleted file mode 100644 index ebb1843487927e6f6ec900e1ab7fc99cd33319c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 111 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjW}YsNAs(G?&l>VF7ziA8_8Fysl9lX%ryl_7Mzsr0MIvH73Kjw=`qzeRc sU)Jx)%KrX$IqR})f!?s0%;}5_NuLyFvSoS10j*&0boFyt=akR{01%)uZvX%Q diff --git a/app/src/main/resExtra/drawable/language_en_gb.png b/app/src/main/resExtra/drawable/language_en_gb.png deleted file mode 100644 index fb1edaa081505d1ba2ab9243a19fbd2d678ca114..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 626 zcmV-&0*(ENP)=eS0NA&!<#S=JdL1W5FP|82=vlPG9<`@M4%wpLAs2DpbkOlA(49R&&5iZ zn+MZ_L`+ncQB%z5&tjOULsHXy_4AwWdbc^ZLxKk%crNeWXP@8uKHu;6bxCp^X1k67 zMFGAvG-x}KP<-i+F5U>p<$aXX$)q${Qljwg$ky_*$}c?4xyRS^O3{bCnl3BTVqc%q zfQ9SLid0l+Ega^e?pYC?JkwJ&;Kb=}-M&An`74e3==ExSc2;|p0-U?{T62#rO_i4F zS67$$W%Bc)JoV2D0^H}HXv`Yc2aiYJ+S-)d*wF8lbzQnS^bf#|r>c83_+nh2d_F~M zYxOrCS7L2bjh!QT0d=iGE!?@QX}4P|fq*&K+likB%1j2p?iT-;zINP74TVBx=viL&d2I9A9Dte1O2zzsbAA5D zs?J^=$XR+C!0C!9C!okm0qnv5-D$vK{5gkqI=Nu+S{#D~Ywxx1zhoB1;wTo$LbCxZ z9swW(1c5N}F4=hzsUbO}hXj!#l5_$%9nz(cG7zMV#Pb3$2PQE?yQX0X6JaJyl?`A9 z6Jkb8$w4qFX2rA_0BnuDd2H;C?Xkb@$b0~rI3ZRjVurXOc8H&hB@<8t6@f)?5n%S8 z90Z^VMgo!|FbPfqGz}nHiCChR$jx3>A%NXPJ&{lJ^9eZqWF8H`4j8pS$8076pa1{> M07*qoM6N<$f>OC1a{vGU diff --git a/app/src/main/resExtra/drawable/language_en_us.png b/app/src/main/resExtra/drawable/language_en_us.png deleted file mode 100644 index b269593a3b44eb01e5b83d40c7e98c234b462103..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gj;hrvzAs)w*fBgS%&#Y^Bcm=CV z(o8oTY*+Ec)I$ztaD0e0st;xG=cyC diff --git a/app/src/main/resExtra/drawable/language_es.png b/app/src/main/resExtra/drawable/language_es.png deleted file mode 100644 index cf53a8d6527b37d82de24a9f5c6d42fbbfa500f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 312 zcmV-80muG{P)X1e}ARLB3n%SH14WDn*4C(C61pP%Ob|JNQ$Edb)bhZ+BGTWkC!>Z%xtof3BVX|CZ%;|Nk6fqEafN79Ku1dFWd(^lP*sZ2XVx|J<&}36 zGZ2~k-=Eti>tMnr29JwO{ZR%TIzRla4YCe;Y)a_3p5c6pi9udLVDH808&iNrFnGH9 KxvX^?1% diff --git a/app/src/main/resExtra/drawable/language_fr.png b/app/src/main/resExtra/drawable/language_fr.png deleted file mode 100644 index 91a645e8337b978a33a856bcab1ffe9b76ae005f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 110 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gjrk*a2As(H{KmPx>XVx|J<&}36 zGicHK+0QM^^j_At@KGSQo36yxgey&f+-=iXw;Wk4CUAtoHMaS;`}!4*Km!;&UHx3v IIVCg!00hqXVx|J<&}36 zn!8A>2lj6dtYB?E%GCDl!2c}=7K`<$aA$P7>ne0GK76e*{lDqI&p<;M NJYD@<);T3K0RS{-CdB{% diff --git a/app/src/main/resExtra/drawable/language_id.png b/app/src/main/resExtra/drawable/language_id.png deleted file mode 100644 index e938f433bb2f43dac5d0db194f17bb381cfc1815..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 107 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjMxHK?As)w*fBgS%&#Y^Bcm=CV zWPxA6TYKFPD_9qc@u+hDyUf=UWsr3+U{k`DQ!*CZ3>*9Q?oNI8?g>yggQu&X%Q~lo FCIBrkBR2p5 diff --git a/app/src/main/resExtra/drawable/language_it.png b/app/src/main/resExtra/drawable/language_it.png deleted file mode 100644 index 8e9e7fa697ab24f589ffb3c1418c240d52249254..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 110 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gjrk*a2As(H{KmPx>XVx|J<&}36 zGw><;-Onw|)V}p>;iEuqH(iOX30Il|x!b0(ZaK18OyCH^?bgWdQ(dd2fd(*my85}S Ib4q9e04@R{wg3PC diff --git a/app/src/main/resExtra/drawable/language_ja.png b/app/src/main/resExtra/drawable/language_ja.png deleted file mode 100644 index 8fb1a36a303618a20c8323745155c04f9c2da1e0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjZJsWUAs)w*fBgS%&#Y^Bcm?Z` zCToX%L>dN*UL`PfM|S`K diff --git a/app/src/main/resExtra/drawable/language_ko.png b/app/src/main/resExtra/drawable/language_ko.png deleted file mode 100644 index 58b00b580525bae99fe615cff77e27c3da174d29..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 655 zcmV;A0&x9_P)?6kUj2DN<@lUHGk(f*>ksJ`hMCA7hO9K$4AFG^7wLRA`|gknFPwZVK*# zkVQUZ;YL%H7W`n)fHV1!MYF5<4w#zbycaU4m~;XbH@$G+&Aj{0xo_UNZx{f~VS+gl zkScIk@ppl8xr}15D4C^HDp5!h=ytnsxm>VXtw^WS;CX&1F_|MdB-i8dNE3*~VoBb(9~*NHFbJp93AtQ8+NLC;(J1X? zvVhq2*G8+ic+{KxZ;eI@vDs{N$MJYv+Ern<+v&n&GKo&7GxDk+-Y2=FAjyYJF0Mbe pIx;wpqZr$!|MI#%`ept?%C~ PG>5^{)z4*}Q$iB}gkr gdVknV=5$5|k!=jxN_xp_f#x!Jy85}Sb4q9e04CKbw*UYD diff --git a/app/src/main/resExtra/drawable/language_nl.png b/app/src/main/resExtra/drawable/language_nl.png deleted file mode 100644 index 0f98743cb31ccbbde4ba8c887e2d7eea5e210bf2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 114 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjmYyz-As(H{KmPx>XVx|J<&}36 zTQm9M4}Wf(tb+=h9@xJSS;3~!ky9SuB*_&XcDS<)sS`8J)j{B Mp00i_>zopr062;z1^@s6 diff --git a/app/src/main/resExtra/drawable/language_pl.png b/app/src/main/resExtra/drawable/language_pl.png deleted file mode 100644 index b9807dcce09edbfe9804ea34eaea20bd230759f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 111 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjW}YsNAs(H{KmPx>XVx|J<&}36 z+f(!LkG<}P6|9TJcvQL9Y25m^oK7(8A5 KT-G@yGywp;C?tOX diff --git a/app/src/main/resExtra/drawable/language_pt_br.png b/app/src/main/resExtra/drawable/language_pt_br.png deleted file mode 100644 index 40890a6dcbe52a26146d02157a67f0a23fbbd179..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 797 zcmV+&1LFLNP)@mRK-2jE4oSbE2X~G2yB(oe#7+10u?H>Rn<$(4?^o)pr8S?2VgRSoJQ5c~1(L>>0h(OP?5b~=~kZ}|s*|ENsQ4wU<61lROQ#SxuGO^SBL3lsOqk`qf z3>K{ss59Pyq0xei<{_Bd$539=i@fYcD7}jyaV^24b}8_TgM66cA%8&4y$gxA1_WeHntq=Mf!PiC|$dH1Y~WDb7Ld ztA|QZgjjV0Uf+#edxuX%TY6IoXF5CD4UfFi^Qw+`+#2%*NE@TnKZf?7mKD`+Nc zsiNct1o<_fAWMgDHqP%h(WtM-ubYiux9Q4*pXdw4yJJV3YPAEISg&qcsVahoxv54uDr%(r?$p)&SdG*Smk2 b{}u29o1AP|`j?#Q00000NkvXXu0mjfdSY~9 diff --git a/app/src/main/resExtra/drawable/language_pt_pt.png b/app/src/main/resExtra/drawable/language_pt_pt.png deleted file mode 100644 index 8698cfaa880bfd0c1721a244c603261cedf52610..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 474 zcmV<00VV#4P)-un|;YV0r%pYsd8e7@hW43OPtWNF~90GYFj+j1q> z-8ugOkkM(u)~m(gEnwf3%YmpsQfX2Hs9a{IycRm1)$#mQ6_RKqR$^t_Z6aJiJ# zvVurJ$$FQ-50e$Cxt5^4hDg~%{7yYP3o0&z!o-2c14YF4RKyKhZr-i(B@`!c6b1hV z7X_t+8uXmBC=v%e;|d0SI@at;c9-Uu-}=VPM~T4uw`{g+IPcJMFqD%xFyhO{K4N6g zrsLDtER!EjneZR8>02gjE9KB3uKaZF(+;yV;HYW+U{ApW`0RMLn@O zHAhd97*SSNIjbu<^bDB^wraSpZ{tdQ%65yu=fz^8(gVU~O>#A@cw=C6LCK5mO8T3u zd^Z}2h-I94^9VL7Q?qEsko>|xM@Cw!= zQ4ZP$S&TEqYS!le{I6*u)l)BT&6wVN}~z~U%xfAfZMTVg2k?= z8j1C+@^@@2Z4Cvtzt=f{4rzp(C= z{q*}z2E32%YveEPW0kvV{omV7k6oJYu!5b(93Ad^Cs+J)KYpAk=zsK+d^TymMUFK& zuRbL15o`G1UcUeT?(F4FnL)hjr zEyygJ|KF+a@c)TBZ~eDz+DW+u46#f8BjcEYdH=usfvC9l{L_DQd15h63zTAK|6h6N z=Kt-t-u<7j>IC&I0Ac6!+5Zd-kUJXJPvB+?~gK=q~l=LF{?r%(qLAXo2~?tSWnnY<}5~r6^Ev5=xGFVdQ&MBb@0D5^N&;S4c diff --git a/app/src/main/resExtra/drawable/language_tr.png b/app/src/main/resExtra/drawable/language_tr.png deleted file mode 100644 index c147631c8bc27506317f5b27f046eca13f7a8dbf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 273 zcmV+s0q*{ZP)i!m`nUWE$|4i;FWv8|8HA%{QvXx85nYr(6$?Jpwty7;|M&CP z|Bnsr|DQ^zg2kT*%m062=|Y(WAXonX^9O9fyRE%?~hgVXRAMz;Tdo<8^g_pLi%Hdz*Y>X}3v3*bR??&AN)yi(K; zBIHQ^P}PV%lBLzDlT1P2%iKl(UsyQ9gXWc+Kb14ui*ZfwmDi}00000NkvXXu0mjfCH;L* diff --git a/app/src/main/resExtra/drawable/language_uk.png b/app/src/main/resExtra/drawable/language_uk.png deleted file mode 100644 index badac50f4b0df99bafef174f91a577d8836d6713..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 111 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjW}YsNAs(H{KmPx>XVx|J<&}36 zGccI**Pq)a>);Aj=aWtI%a8uM%+w!ckaaL%Q^Jeu8P2zu7{WVm*ThZzUIH|M!PC{x JWt~$(69A@6B((ql diff --git a/app/src/main/resExtra/drawable/language_zh.png b/app/src/main/resExtra/drawable/language_zh.png deleted file mode 100644 index 17cd5d018d4ac49ec43306034cf00278ce38e25b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 350 zcmV-k0iphhP)8f8xmtW`o6mu78=v4aRrmfj&`&_=+?OGz9)XFy#kp{Mg6-|KkL9FdHle z^~D_pL9kCi7J)1!$pVl8&w_aVf8WmX|KA-3F#f)S<^Qu_9(b^TgDMqf0U1GbM^5nn ziv;ff|K9+G-!lAvnZykiL)HZH1t^$E4