Prevent double texts

pull/194/merge
M66B 3 years ago
parent 9d7c1af493
commit d2570a116b

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

Loading…
Cancel
Save