Skip to content

Closes #3094 #3095

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 28, 2019
Merged

Closes #3094 #3095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/src/main/java/fr/free/nrw/commons/upload/DescriptionsAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,6 @@ private void initLanguageSpinner(int position, Description description) {
spinnerDescriptionLanguages.getContext(),
R.layout.row_item_languages_spinner, selectedLanguages,
savedLanguageValue);
languagesAdapter.notifyDataSetChanged();
spinnerDescriptionLanguages.setAdapter(languagesAdapter);

spinnerDescriptionLanguages.setOnItemSelectedListener(new OnItemSelectedListener() {
Expand All @@ -162,6 +161,7 @@ public void onItemSelected(AdapterView<?> adapterView, View view, int position,
selectedLanguages.put(adapterView, languageCode);
((SpinnerLanguagesAdapter) adapterView
.getAdapter()).selectedLangCode = languageCode;
spinnerDescriptionLanguages.setSelection(position);
Timber.d("Description language code is: "+languageCode);
}

Expand All @@ -171,7 +171,7 @@ public void onNothingSelected(AdapterView<?> adapterView) {
});

if (description.getSelectedLanguageIndex() == -1) {
if (savedLanguageValue != null) {
if (!TextUtils.isEmpty(savedLanguageValue)) {
// If user has chosen a default language from settings activity savedLanguageValue is not null
spinnerDescriptionLanguages.setSelection(languagesAdapter.getIndexOfLanguageCode(savedLanguageValue));
} else {
Expand All @@ -180,7 +180,7 @@ public void onNothingSelected(AdapterView<?> adapterView) {
.getIndexOfUserDefaultLocale(spinnerDescriptionLanguages.getContext());
spinnerDescriptionLanguages.setSelection(defaultLocaleIndex, true);
} else {
spinnerDescriptionLanguages.setSelection(0);
spinnerDescriptionLanguages.setSelection(0,true);
}
}

Expand Down
7 changes: 0 additions & 7 deletions app/src/main/java/fr/free/nrw/commons/upload/SpinnerLanguagesAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,14 +139,7 @@ public void init(int position, boolean isDropDownView, String savedLanguageValue
String languageCode = LangCodeUtils.fixLanguageCode(languageCodesList.get(position));
final String languageName = StringUtils.capitalize(languageNamesList.get(position));

if(savedLanguageValue.equals("")){
savedLanguageValue = Locale.getDefault().getLanguage();
}

if (!isDropDownView) {
if( !dropDownClicked){
languageCode = LangCodeUtils.fixLanguageCode(savedLanguageValue);
}
view.setVisibility(View.GONE);
if (languageCode.length() > 2)
tvLanguage.setText(languageCode.substring(0, 2));
Expand Down