mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 04:43:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix:Setting Language list is not an language list which is supported by Commons for caption and description (#4325)

Browse source
This commit is contained in:
Prince kushwaha 2021-04-07 20:03:47 +05:30 • committed by GitHub
parent 049dd7c79a
commit 0d23e65e0f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

35
app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.java
View file

@ -36,6 +36,7 @@ import java.util.List;
import java.util.Locale; import java.util.Locale;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Named; import javax.inject.Named;
import org.wikipedia.language.AppLanguageLookUpTable;
public class SettingsFragment extends PreferenceFragmentCompat { public class SettingsFragment extends PreferenceFragmentCompat {
@ -144,20 +145,18 @@ public class SettingsFragment extends PreferenceFragmentCompat {
* to remember later * to remember later
*/ */
private void prepareLanguages() { private void prepareLanguages() {
List<String> languageNamesList = new ArrayList<>(); List<String> languageNamesList;
List<String> languageCodesList = new ArrayList<>(); List<String> languageCodesList;
List<Language> languages = getLanguagesSupportedByDevice(); AppLanguageLookUpTable appLanguageLookUpTable = new AppLanguageLookUpTable(getContext());
languageNamesList = appLanguageLookUpTable.getLocalizedNames();
languageCodesList = appLanguageLookUpTable.getCodes();
List<String> languageNameWithCodeList = new ArrayList<>();
for(Language language: languages) { for (int i = 0; i < languageNamesList.size(); i++) {
// Go through all languages and add them to lists languageNameWithCodeList.add(languageNamesList.get(i) + "[" + languageCodesList.get(i) + "]");
if(!languageCodesList.contains(language.getLocale().getLanguage())) {
// This if prevents us from adding same language twice
languageNamesList.add(language.getLocale().getDisplayName());
languageCodesList.add(language.getLocale().getLanguage());
}
} }
CharSequence[] languageNames = languageNamesList.toArray(new CharSequence[0]); CharSequence[] languageNames = languageNameWithCodeList.toArray(new CharSequence[0]);
CharSequence[] languageCodes = languageCodesList.toArray(new CharSequence[0]); CharSequence[] languageCodes = languageCodesList.toArray(new CharSequence[0]);
// Add all languages and languages codes to lists preference as pair // Add all languages and languages codes to lists preference as pair
langListPreference.setEntries(languageNames); langListPreference.setEntries(languageNames);
@ -165,7 +164,7 @@ public class SettingsFragment extends PreferenceFragmentCompat {
// Gets current language code from shared preferences // Gets current language code from shared preferences
String languageCode = getCurrentLanguageCode(); String languageCode = getCurrentLanguageCode();
if (languageCode.equals("")){ if (languageCode.equals("")) {
// If current language code is empty, means none selected by user yet so use phone local // If current language code is empty, means none selected by user yet so use phone local
langListPreference.setValue(Locale.getDefault().getLanguage()); langListPreference.setValue(Locale.getDefault().getLanguage());
} else { } else {
@ -188,18 +187,6 @@ public class SettingsFragment extends PreferenceFragmentCompat {
return defaultKvStore.getString(Prefs.KEY_LANGUAGE_VALUE, ""); return defaultKvStore.getString(Prefs.KEY_LANGUAGE_VALUE, "");
} }
private List<Language> getLanguagesSupportedByDevice() {
List<Language> languages = new ArrayList<>();
Locale[] localesArray = Locale.getAvailableLocales();
for (Locale locale : localesArray) {
languages.add(new Language(locale));
}
Collections.sort(languages, (language, t1) -> language.getLocale().getDisplayName()
.compareTo(t1.getLocale().getDisplayName()));
return languages;
}
/** /**
* First checks for external storage permissions and then sends logs via email * First checks for external storage permissions and then sends logs via email
*/ */