Cooltey has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/391132 )
Change subject: Fix: Incorrect language counts
......................................................................
Fix: Incorrect language counts
- Update the language counts when the article is in Chinese (should +1 if it's
in Traditional or Simplified Chinese)
BUG: T180182
Change-Id: I4c40b7edcf9324404ccff9c7c99540e03fc0b114
---
M app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentView.java
M app/src/main/java/org/wikipedia/util/L10nUtil.java
2 files changed, 24 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/32/391132/1
diff --git
a/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentView.java
b/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentView.java
index d43dc68..1a8fe01 100644
--- a/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentView.java
+++ b/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentView.java
@@ -37,6 +37,7 @@
import org.wikipedia.search.SearchResults;
import org.wikipedia.util.DimenUtil;
import org.wikipedia.util.GeoUtil;
+import org.wikipedia.util.L10nUtil;
import org.wikipedia.util.StringUtil;
import org.wikipedia.util.log.L;
import org.wikipedia.views.ConfigurableTextView;
@@ -265,12 +266,18 @@
pageLastUpdatedText.setText(parentFragment.getString(R.string.last_updated_text,
formatDateRelative(page.getPageProperties().getLastModified())));
pageLastUpdatedText.setVisibility(View.VISIBLE);
-
pageTalkContainer.setVisibility(page.getTitle().namespace() ==
Namespace.TALK ? GONE : VISIBLE);
-
pageLanguagesContainer.setVisibility(page.getPageProperties().getLanguageCount()
== 0 ? GONE : VISIBLE);
-
pageLanguagesCount.setText(parentFragment.getString(R.string.language_count_link_text,
- page.getPageProperties().getLanguageCount()));
+ /**
+ * TODO: It only updates the count when the article is in Chinese.
+ * If an article is also available in Chinese, the count will be less
one.
+ * @see LangLinksActivity.java updateLanguageEntriesSupported()
+ */
+ int getLanguageCount =
L10nUtil.getUpdatedLanguageCountIfNeeded(page.getTitle().getWikiSite().languageCode(),
+ page.getPageProperties().getLanguageCount());
+
+ pageLanguagesContainer.setVisibility(getLanguageCount == 0 ? GONE :
VISIBLE);
+
pageLanguagesCount.setText(parentFragment.getString(R.string.language_count_link_text,
getLanguageCount));
pageMapContainer.setVisibility(page.getPageProperties().getGeo() ==
null ? GONE : VISIBLE);
diff --git a/app/src/main/java/org/wikipedia/util/L10nUtil.java
b/app/src/main/java/org/wikipedia/util/L10nUtil.java
index fcb9cf1..a4b015b 100644
--- a/app/src/main/java/org/wikipedia/util/L10nUtil.java
+++ b/app/src/main/java/org/wikipedia/util/L10nUtil.java
@@ -225,6 +225,19 @@
}
}
+ public static int getUpdatedLanguageCountIfNeeded(String getLanguageCode,
int originalLanguageCount) {
+
+ int updatedLanguageCount = originalLanguageCount;
+
+ if (getLanguageCode.equals(CHINESE_LANGUAGE_CODE)) {
+ updatedLanguageCount = updatedLanguageCount + 2; // for both
Traditional and Simplified
+ } else if (getLanguageCode.equals(TRADITIONAL_CHINESE_LANGUAGE_CODE)
|| getLanguageCode.equals(SIMPLIFIED_CHINESE_LANGUAGE_CODE)) {
+ updatedLanguageCount = updatedLanguageCount + 1;
+ }
+
+ return updatedLanguageCount;
+ }
+
private L10nUtil() {
}
}
--
To view, visit https://gerrit.wikimedia.org/r/391132
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4c40b7edcf9324404ccff9c7c99540e03fc0b114
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Cooltey <cf...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
