From 4d785bd6bd7f5c7f989c588a001f152255467d47 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Thu, 27 Apr 2017 23:03:47 +0200
Subject: [PATCH] use better variable name for the set of available locales
---
app/src/main/java/org/fdroid/fdroid/data/App.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/app/src/main/java/org/fdroid/fdroid/data/App.java b/app/src/main/java/org/fdroid/fdroid/data/App.java
index 49ccee5be..e8a61688e 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/App.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/App.java
@@ -384,13 +384,13 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
localeTag = languageTag + "-" + countryTag;
}
- Set<String> locales = localized.keySet();
+ Set<String> availableLocales = localized.keySet();
Set<String> localesToUse = new LinkedHashSet<>();
if (Build.VERSION.SDK_INT >= 24) {
LocaleList localeList = Resources.getSystem().getConfiguration().getLocales();
for (String toUse : localeList.toLanguageTags().split(",")) {
localesToUse.add(toUse);
- for (String l : locales) {
+ for (String l : availableLocales) {
if (l.equals(toUse.split("-")[0])) {
localesToUse.add(l);
break;
@@ -398,22 +398,22 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
}
}
} else {
- if (locales.contains(localeTag)) {
+ if (availableLocales.contains(localeTag)) {
localesToUse.add(localeTag);
}
- if (locales.contains(languageTag)) {
+ if (availableLocales.contains(languageTag)) {
localesToUse.add(languageTag);
}
- for (String l : locales) {
+ for (String l : availableLocales) {
if (l.startsWith(languageTag)) {
localesToUse.add(l);
}
}
}
- if (locales.contains("en-US")) {
+ if (availableLocales.contains("en-US")) {
localesToUse.add("en-US");
}
- for (String l : locales) {
+ for (String l : availableLocales) {
if (l.startsWith("en")) {
localesToUse.add(l);
break;