Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use better variable name for the set of available locales

Browse Source
This commit is contained in:
Hans-Christoph Steiner 2017-04-27 23:03:47 +02:00
parent 03168ff99e
commit 4d785bd6bd
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/org/fdroid/fdroid/data/App.java
View File

@ -384,13 +384,13 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
localeTag = languageTag + "-" + countryTag; localeTag = languageTag + "-" + countryTag;
} }
Set<String> locales = localized.keySet(); Set<String> availableLocales = localized.keySet();
Set<String> localesToUse = new LinkedHashSet<>(); Set<String> localesToUse = new LinkedHashSet<>();
if (Build.VERSION.SDK_INT >= 24) { if (Build.VERSION.SDK_INT >= 24) {
LocaleList localeList = Resources.getSystem().getConfiguration().getLocales(); LocaleList localeList = Resources.getSystem().getConfiguration().getLocales();
for (String toUse : localeList.toLanguageTags().split(",")) { for (String toUse : localeList.toLanguageTags().split(",")) {
localesToUse.add(toUse); localesToUse.add(toUse);
for (String l : locales) { for (String l : availableLocales) {
if (l.equals(toUse.split("-")[0])) { if (l.equals(toUse.split("-")[0])) {
localesToUse.add(l); localesToUse.add(l);
break; break;
@ -398,22 +398,22 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
} }
} }
} else { } else {
if (locales.contains(localeTag)) { if (availableLocales.contains(localeTag)) {
localesToUse.add(localeTag); localesToUse.add(localeTag);
} }
if (locales.contains(languageTag)) { if (availableLocales.contains(languageTag)) {
localesToUse.add(languageTag); localesToUse.add(languageTag);
} }
for (String l : locales) { for (String l : availableLocales) {
if (l.startsWith(languageTag)) { if (l.startsWith(languageTag)) {
localesToUse.add(l); localesToUse.add(l);
} }
} }
} }
if (locales.contains("en-US")) { if (availableLocales.contains("en-US")) {
localesToUse.add("en-US"); localesToUse.add("en-US");
} }
for (String l : locales) { for (String l : availableLocales) {
if (l.startsWith("en")) { if (l.startsWith("en")) {
localesToUse.add(l); localesToUse.add(l);
break; break;