[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Fix Chinese summary tags show in English

2017-09-12 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377359 )

Change subject: Fix Chinese summary tags show in English
..


Fix Chinese summary tags show in English

In this update:
 - Replace with L10nUtil.setDesiredLocale() to get correct Chinese tags.
 - Change L10nUtil.setDesiredLocale to public

Bug: T174709
Change-Id: I6eeafa835f40a75e22aeeab1ecbd2411f210639e
---
M app/src/main/java/org/wikipedia/edit/preview/EditPreviewFragment.java
M app/src/main/java/org/wikipedia/util/L10nUtil.java
2 files changed, 9 insertions(+), 3 deletions(-)

Approvals:
  Dbrant: Looks good to me, approved
  jenkins-bot: Verified



diff --git 
a/app/src/main/java/org/wikipedia/edit/preview/EditPreviewFragment.java 
b/app/src/main/java/org/wikipedia/edit/preview/EditPreviewFragment.java
index 9c57d00..6233058 100644
--- a/app/src/main/java/org/wikipedia/edit/preview/EditPreviewFragment.java
+++ b/app/src/main/java/org/wikipedia/edit/preview/EditPreviewFragment.java
@@ -98,7 +98,7 @@
 Configuration config = new 
Configuration(oldResources.getConfiguration());
 Resources tempResources = getResources();
 if (!oldLocale.getLanguage().equals(newLocale.getLanguage()) && 
!newLocale.getLanguage().equals("test")) {
-ConfigurationCompat.setLocale(config, newLocale);
+L10nUtil.setDesiredLocale(config, newLocale);
 tempResources = new Resources(assets, metrics, config);
 }
 
diff --git a/app/src/main/java/org/wikipedia/util/L10nUtil.java 
b/app/src/main/java/org/wikipedia/util/L10nUtil.java
index 9aa538c..445cb3e 100644
--- a/app/src/main/java/org/wikipedia/util/L10nUtil.java
+++ b/app/src/main/java/org/wikipedia/util/L10nUtil.java
@@ -205,7 +205,7 @@
 return getRelativeTimeSpanString(date.getTime(), currentTimeMillis(), 
SECOND_IN_MILLIS, 0).toString();
 }
 
-private static void setDesiredLocale(@NonNull Configuration config, 
@NonNull Locale desiredLocale) {
+public static void setDesiredLocale(@NonNull Configuration config, 
@NonNull Locale desiredLocale) {
 // when loads API in chinese variant, we can get zh-hant, zh-hans and 
zh
 // but if we want to display chinese correctly based on the article 
itself, we have to
 // detect the variant from the API responses; otherwise, we will only 
get english texts.
@@ -217,7 +217,13 @@
 } else if (desiredLocale.getLanguage().equals(CHINESE_LANGUAGE_CODE)) {
 // create a new Locale object to manage only "zh" language code 
based on its app language
 // code. e.g.: search "HK" article in "zh-hant" or "zh-hans" will 
get "zh" language code
-setLocale(config, new 
Locale(WikipediaApp.getInstance().getAppLanguageCode()));
+if 
(WikipediaApp.getInstance().getAppLanguageCode().equals(TRADITIONAL_CHINESE_LANGUAGE_CODE))
 {
+setLocale(config, TRADITIONAL_CHINESE);
+} else if 
(WikipediaApp.getInstance().getAppLanguageCode().equals(SIMPLIFIED_CHINESE_LANGUAGE_CODE))
 {
+setLocale(config, SIMPLIFIED_CHINESE);
+} else {
+setLocale(config, desiredLocale);
+}
 } else {
 setLocale(config, desiredLocale);
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/377359
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6eeafa835f40a75e22aeeab1ecbd2411f210639e
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Cooltey 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: Sharvaniharan 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Fix Chinese summary tags show in English

2017-09-11 Thread Cooltey (Code Review) 
Cooltey has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377359 )

Change subject: Fix Chinese summary tags show in English
..

Fix Chinese summary tags show in English

In this update:
 - Replace with L10nUtil.setDesiredLocale() to get correct Chinese tags.
 - Change L10nUtil.setDesiredLocale to public

Bug: T174709
Change-Id: I6eeafa835f40a75e22aeeab1ecbd2411f210639e
---
M app/src/main/java/org/wikipedia/edit/preview/EditPreviewFragment.java
M app/src/main/java/org/wikipedia/util/L10nUtil.java
2 files changed, 9 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/59/377359/1

diff --git 
a/app/src/main/java/org/wikipedia/edit/preview/EditPreviewFragment.java 
b/app/src/main/java/org/wikipedia/edit/preview/EditPreviewFragment.java
index 9c57d00..6233058 100644
--- a/app/src/main/java/org/wikipedia/edit/preview/EditPreviewFragment.java
+++ b/app/src/main/java/org/wikipedia/edit/preview/EditPreviewFragment.java
@@ -98,7 +98,7 @@
 Configuration config = new 
Configuration(oldResources.getConfiguration());
 Resources tempResources = getResources();
 if (!oldLocale.getLanguage().equals(newLocale.getLanguage()) && 
!newLocale.getLanguage().equals("test")) {
-ConfigurationCompat.setLocale(config, newLocale);
+L10nUtil.setDesiredLocale(config, newLocale);
 tempResources = new Resources(assets, metrics, config);
 }
 
diff --git a/app/src/main/java/org/wikipedia/util/L10nUtil.java 
b/app/src/main/java/org/wikipedia/util/L10nUtil.java
index 9aa538c..445cb3e 100644
--- a/app/src/main/java/org/wikipedia/util/L10nUtil.java
+++ b/app/src/main/java/org/wikipedia/util/L10nUtil.java
@@ -205,7 +205,7 @@
 return getRelativeTimeSpanString(date.getTime(), currentTimeMillis(), 
SECOND_IN_MILLIS, 0).toString();
 }
 
-private static void setDesiredLocale(@NonNull Configuration config, 
@NonNull Locale desiredLocale) {
+public static void setDesiredLocale(@NonNull Configuration config, 
@NonNull Locale desiredLocale) {
 // when loads API in chinese variant, we can get zh-hant, zh-hans and 
zh
 // but if we want to display chinese correctly based on the article 
itself, we have to
 // detect the variant from the API responses; otherwise, we will only 
get english texts.
@@ -217,7 +217,13 @@
 } else if (desiredLocale.getLanguage().equals(CHINESE_LANGUAGE_CODE)) {
 // create a new Locale object to manage only "zh" language code 
based on its app language
 // code. e.g.: search "HK" article in "zh-hant" or "zh-hans" will 
get "zh" language code
-setLocale(config, new 
Locale(WikipediaApp.getInstance().getAppLanguageCode()));
+if 
(WikipediaApp.getInstance().getAppLanguageCode().equals(TRADITIONAL_CHINESE_LANGUAGE_CODE))
 {
+setLocale(config, TRADITIONAL_CHINESE);
+} else if 
(WikipediaApp.getInstance().getAppLanguageCode().equals(SIMPLIFIED_CHINESE_LANGUAGE_CODE))
 {
+setLocale(config, SIMPLIFIED_CHINESE);
+} else {
+setLocale(config, desiredLocale);
+}
 } else {
 setLocale(config, desiredLocale);
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/377359
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6eeafa835f40a75e22aeeab1ecbd2411f210639e
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Cooltey 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits