jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/350696 )
Change subject: Stop setting the app language to null when it matches the
system language
......................................................................
Stop setting the app language to null when it matches the system language
With this, the app will remember when been explicitly set to the system
language (rather than merely defaulting to it).
This also has the effect of making dev build language randomization work as
intended (i.e., only on install and until a new language has been set
explicitly.)
Change-Id: I4e441856e5a05fcffd520229e9bb9b5b981927fd
---
M app/src/main/java/org/wikipedia/settings/LanguagePreferenceDialog.java
1 file changed, 1 insertion(+), 13 deletions(-)
Approvals:
Niedzielski: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/app/src/main/java/org/wikipedia/settings/LanguagePreferenceDialog.java
b/app/src/main/java/org/wikipedia/settings/LanguagePreferenceDialog.java
index b4ce530..49271d8 100644
--- a/app/src/main/java/org/wikipedia/settings/LanguagePreferenceDialog.java
+++ b/app/src/main/java/org/wikipedia/settings/LanguagePreferenceDialog.java
@@ -19,7 +19,6 @@
import org.wikipedia.R;
import org.wikipedia.WikipediaApp;
import org.wikipedia.analytics.AppLanguageSelectFunnel;
-import org.wikipedia.language.AppLanguageState;
import java.util.ArrayList;
import java.util.List;
@@ -68,19 +67,8 @@
public void onItemClick(AdapterView<?> adapterView, View view, int
i, long l) {
String lang = (String) languagesList.getAdapter().getItem(i);
if (!lang.equals(app.getAppOrSystemLanguageCode())) {
-
- boolean systemLanguage =
lang.equals(app.getSystemLanguageCode());
- String appCode = systemLanguage
- ? AppLanguageState.SYSTEM_LANGUAGE_CODE
- : lang;
-
- app.setAppLanguageCode(appCode);
-
- // Always use the nonnull language code for MRU languages
so the list is updated
- // with the actual language used. Note: there are likely
nulls in this list from
- // previous code. You can see the actual list in dev
settings.
+ app.setAppLanguageCode(lang);
app.setMruLanguageCode(lang);
-
funnel.logSelect();
}
dismiss();
--
To view, visit https://gerrit.wikimedia.org/r/350696
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4e441856e5a05fcffd520229e9bb9b5b981927fd
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway <[email protected]>
Gerrit-Reviewer: Niedzielski <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
