jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/379987 )
Change subject: Never suppress the language selection UI
......................................................................
Never suppress the language selection UI
Our dev settings contain a setting to indicate whether the MediaWiki
installation the app is hitting supports a language code subdomain
component; for instance, a standard MW-Vagrant installation doesn't.
We shouldn't hide the language selection UI when this is set to false,
because the app language also affects the Accept-Language header sent,
which we may want to test even against a single-language wiki (for
testing language variants, for example.
Change-Id: Iada4a5863c532317df566ebca081c45fea2ada92
---
M app/src/main/java/org/wikipedia/search/SearchFragment.java
M app/src/main/java/org/wikipedia/settings/SettingsPreferenceLoader.java
2 files changed, 17 insertions(+), 27 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
jenkins-bot: Verified
diff --git a/app/src/main/java/org/wikipedia/search/SearchFragment.java
b/app/src/main/java/org/wikipedia/search/SearchFragment.java
index 88104e8..e601be8 100644
--- a/app/src/main/java/org/wikipedia/search/SearchFragment.java
+++ b/app/src/main/java/org/wikipedia/search/SearchFragment.java
@@ -33,7 +33,6 @@
import org.wikipedia.page.PageTitle;
import org.wikipedia.readinglist.AddToReadingListDialog;
import org.wikipedia.settings.LanguagePreferenceDialog;
-import org.wikipedia.settings.Prefs;
import org.wikipedia.util.DeviceUtil;
import org.wikipedia.util.FeedbackUtil;
import org.wikipedia.views.ViewUtil;
@@ -429,11 +428,6 @@
}
private void initLangButton() {
- if (!Prefs.getMediaWikiBaseUriSupportsLangCode()) {
- langButtonContainer.setVisibility(View.GONE);
- return;
- }
-
langButton.setText(app.getAppOrSystemLanguageCode().toUpperCase(Locale.ENGLISH));
formatLangButtonText();
FeedbackUtil.setToolbarButtonLongPressToast(langButtonContainer);
diff --git
a/app/src/main/java/org/wikipedia/settings/SettingsPreferenceLoader.java
b/app/src/main/java/org/wikipedia/settings/SettingsPreferenceLoader.java
index 1d9851b..785b4e9 100644
--- a/app/src/main/java/org/wikipedia/settings/SettingsPreferenceLoader.java
+++ b/app/src/main/java/org/wikipedia/settings/SettingsPreferenceLoader.java
@@ -54,28 +54,24 @@
Preference contentLanguagePref =
findPreference(R.string.preference_key_language);
- if (!Prefs.getMediaWikiBaseUriSupportsLangCode()) {
- contentLanguagePref.setVisible(false);
- } else {
- contentLanguagePref.setOnPreferenceClickListener(new
Preference.OnPreferenceClickListener() {
- @Override
- public boolean onPreferenceClick(Preference preference) {
- LanguagePreferenceDialog langPrefDialog = new
LanguagePreferenceDialog(getActivity(), false);
- langPrefDialog.setOnDismissListener(new
DialogInterface.OnDismissListener() {
- @Override
- public void onDismiss(DialogInterface dialog) {
- String name =
defaultString(WikipediaApp.getInstance().getAppOrSystemLanguageLocalizedName());
- if (getActivity() != null &&
!findPreference(R.string.preference_key_language).getSummary().equals(name)) {
-
findPreference(R.string.preference_key_language).setSummary(name);
-
getActivity().setResult(SettingsActivity.ACTIVITY_RESULT_LANGUAGE_CHANGED);
- }
+ contentLanguagePref.setOnPreferenceClickListener(new
Preference.OnPreferenceClickListener() {
+ @Override
+ public boolean onPreferenceClick(Preference preference) {
+ LanguagePreferenceDialog langPrefDialog = new
LanguagePreferenceDialog(getActivity(), false);
+ langPrefDialog.setOnDismissListener(new
DialogInterface.OnDismissListener() {
+ @Override
+ public void onDismiss(DialogInterface dialog) {
+ String name =
defaultString(WikipediaApp.getInstance().getAppOrSystemLanguageLocalizedName());
+ if (getActivity() != null &&
!findPreference(R.string.preference_key_language).getSummary().equals(name)) {
+
findPreference(R.string.preference_key_language).setSummary(name);
+
getActivity().setResult(SettingsActivity.ACTIVITY_RESULT_LANGUAGE_CHANGED);
}
- });
- langPrefDialog.show();
- return true;
- }
- });
- }
+ }
+ });
+ langPrefDialog.show();
+ return true;
+ }
+ });
setDimImagesPrefEnabled(getActivity(),
WikipediaApp.getInstance().getCurrentTheme());
--
To view, visit https://gerrit.wikimedia.org/r/379987
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iada4a5863c532317df566ebca081c45fea2ada92
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Cooltey <[email protected]>
Gerrit-Reviewer: Dbrant <[email protected]>
Gerrit-Reviewer: Sharvaniharan <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
