mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Prevent double texts

This commit is contained in:
M66B 2021-11-17 08:16:00 +01:00
parent 9d7c1af493
commit d2570a116b
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/eu/faircode/email/Helper.java
View File

@ -1418,16 +1418,14 @@ public class Helper {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
Locale l = Locale.getDefault();
if (!l.getLanguage().equals(language))
locales.add(l);
locales.add(l);
if (!"en".equals(language) && !"en".equals(l.getLanguage()))
locales.add(new Locale("en"));
} else {
LocaleList ll = context.getResources().getConfiguration().getLocales();
for (int i = 0; i < ll.size(); i++) {
Locale l = ll.get(i);
if (!l.getLanguage().equals(language))
locales.add(l);
locales.add(l);
}
}
@ -1437,7 +1435,8 @@ public class Helper {
configuration.setLocale(locale);
Resources res = context.createConfigurationContext(configuration).getResources();
String text = res.getString(resid, formatArgs);
result.add(text);
if (!result.contains(text))
result.add(text);
}
return result.toArray(new String[0]);