From 6068c58f4eb6f0ab567e7a41b5259a34e9f8627c Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 17 May 2021 22:32:17 +0200 Subject: [PATCH] DeepL: added flags --- ATTRIBUTION.md | 1 + app/src/main/assets/ATTRIBUTION.md | 1 + .../java/eu/faircode/email/FragmentCompose.java | 11 +++++++++-- app/src/main/resExtra/drawable/language_de.png | Bin 0 -> 111 bytes app/src/main/resExtra/drawable/language_en_gb.png | Bin 0 -> 626 bytes app/src/main/resExtra/drawable/language_en_us.png | Bin 0 -> 144 bytes app/src/main/resExtra/drawable/language_es.png | Bin 0 -> 312 bytes app/src/main/resExtra/drawable/language_fr.png | Bin 0 -> 110 bytes app/src/main/resExtra/drawable/language_it.png | Bin 0 -> 110 bytes 9 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 app/src/main/resExtra/drawable/language_de.png create mode 100644 app/src/main/resExtra/drawable/language_en_gb.png create mode 100644 app/src/main/resExtra/drawable/language_en_us.png create mode 100644 app/src/main/resExtra/drawable/language_es.png create mode 100644 app/src/main/resExtra/drawable/language_fr.png create mode 100644 app/src/main/resExtra/drawable/language_it.png diff --git a/ATTRIBUTION.md b/ATTRIBUTION.md index beded60b13..cc37144450 100644 --- a/ATTRIBUTION.md +++ b/ATTRIBUTION.md @@ -30,3 +30,4 @@ FairEmail uses: * [Compact Encoding Detection](https://github.com/google/compact_enc_det). Copyright 2016 Google Inc. [Apache License 2.0](https://github.com/google/compact_enc_det/blob/master/LICENSE). * [Compact Language Detector v3](https://github.com/google/cld3). Copyright 2016 Google Inc. All rights reserved. [Apache License 2.0](https://github.com/google/cld3/blob/master/LICENSE). * [POI-HMEF](https://poi.apache.org/components/hmef/index.html). Copyright © 2001-2020 The Apache Software Foundation. [Apache Software License v2](https://poi.apache.org/devel/guidelines.html#The+Licensing). +* [GoSquared's Flag Icon Set](https://github.com/gosquared/flags). Copyright (c) 2017 Go Squared Ltd. [MIT License](https://github.com/gosquared/flags/blob/master/LICENSE.txt). diff --git a/app/src/main/assets/ATTRIBUTION.md b/app/src/main/assets/ATTRIBUTION.md index beded60b13..cc37144450 100644 --- a/app/src/main/assets/ATTRIBUTION.md +++ b/app/src/main/assets/ATTRIBUTION.md @@ -30,3 +30,4 @@ FairEmail uses: * [Compact Encoding Detection](https://github.com/google/compact_enc_det). Copyright 2016 Google Inc. [Apache License 2.0](https://github.com/google/compact_enc_det/blob/master/LICENSE). * [Compact Language Detector v3](https://github.com/google/cld3). Copyright 2016 Google Inc. All rights reserved. [Apache License 2.0](https://github.com/google/cld3/blob/master/LICENSE). * [POI-HMEF](https://poi.apache.org/components/hmef/index.html). Copyright © 2001-2020 The Apache Software Foundation. [Apache Software License v2](https://poi.apache.org/devel/guidelines.html#The+Licensing). +* [GoSquared's Flag Icon Set](https://github.com/gosquared/flags). Copyright (c) 2017 Go Squared Ltd. [MIT License](https://github.com/gosquared/flags/blob/master/LICENSE.txt). diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index 4aa22b33cb..7705f40c3f 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -1448,11 +1448,18 @@ public class FragmentCompose extends FragmentBase { String json = Helper.readStream(is); JSONArray jarray = new JSONArray(json); + String pkg = getContext().getPackageName(); for (int i = 0; i < jarray.length(); i++) { JSONObject jlanguage = jarray.getJSONObject(i); + String name = jlanguage.getString("name"); + String target = jlanguage.getString("language"); SubMenu smenu = menu.findItem(R.id.menu_translate).getSubMenu(); - smenu.add(R.id.group_translate, i + 1, i + 1, jlanguage.getString("name")) - .setIntent(new Intent().putExtra("target", jlanguage.getString("language"))); + MenuItem item = smenu.add(R.id.group_translate, i + 1, i + 1, name) + .setIntent(new Intent().putExtra("target", target)); + String resname = "language_" + target.toLowerCase().replace('-', '_'); + int resid = getResources().getIdentifier(resname, "drawable", pkg); + if (resid > 0) + item.setIcon(resid); } } catch (Throwable ex) { Log.e(ex); diff --git a/app/src/main/resExtra/drawable/language_de.png b/app/src/main/resExtra/drawable/language_de.png new file mode 100644 index 0000000000000000000000000000000000000000..ebb1843487927e6f6ec900e1ab7fc99cd33319c5 GIT binary patch literal 111 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjW}YsNAs(G?&l>VF7ziA8_=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 literal 0 HcmV?d00001 diff --git a/app/src/main/resExtra/drawable/language_en_us.png b/app/src/main/resExtra/drawable/language_en_us.png new file mode 100644 index 0000000000000000000000000000000000000000..b269593a3b44eb01e5b83d40c7e98c234b462103 GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/app/src/main/resExtra/drawable/language_es.png b/app/src/main/resExtra/drawable/language_es.png new file mode 100644 index 0000000000000000000000000000000000000000..cf53a8d6527b37d82de24a9f5c6d42fbbfa500f1 GIT binary patch literal 312 zcmV-80muG{P)X1e}ARLB3n%SH14WDn*4C(C61pP%Ob|JNQ$Edb)bhZ+BGTWkC!>Z%xtof3BVX|CZ%;|Nk6fqEafN79Ku1dFWd(^lP*sZ2XVx|J<&}36 zGicHK+0QM^^j_At@KGSQo36yxgey&f+-=iXw;Wk4CUAtoHMaS;`}!4*Km!;&UHx3v IIVCg!00hqXVx|J<&}36 zGw><;-Onw|)V}p>;iEuqH(iOX30Il|x!b0(ZaK18OyCH^?bgWdQ(dd2fd(*my85}S Ib4q9e04@R{wg3PC literal 0 HcmV?d00001