jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/386409 )
Change subject: Alternate fix for incorrect variant from preview links.
......................................................................
Alternate fix for incorrect variant from preview links.
Bug: T178852
Change-Id: I2f2bfb4f68e9a9d7656751001332c0a1ea86d282
---
M app/src/main/java/org/wikipedia/page/LinkHandler.java
1 file changed, 6 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Cooltey: Looks good to me, approved
diff --git a/app/src/main/java/org/wikipedia/page/LinkHandler.java
b/app/src/main/java/org/wikipedia/page/LinkHandler.java
index 5f694d4..68b5943 100644
--- a/app/src/main/java/org/wikipedia/page/LinkHandler.java
+++ b/app/src/main/java/org/wikipedia/page/LinkHandler.java
@@ -78,8 +78,13 @@
Log.d("Wikipedia", "Link clicked was " + uri.toString());
if (!TextUtils.isEmpty(uri.getPath()) &&
WikiSite.supportedAuthority(uri.getAuthority())
- && uri.getPath().startsWith("/wiki/")) {
+ && (uri.getPath().startsWith("/wiki/") ||
uri.getPath().startsWith("/zh-"))) {
WikiSite site = new WikiSite(uri);
+ if (site.subdomain().equals(getWikiSite().subdomain())
+ &&
!site.languageCode().equals(getWikiSite().languageCode())) {
+ // override the languageCode from the parent WikiSite, in case
it's a variant.
+ site = new WikiSite(uri.getAuthority(),
getWikiSite().languageCode());
+ }
PageTitle title = TextUtils.isEmpty(titleString)
? site.titleForInternalLink(uri.getPath())
: new PageTitle(titleString, site);
--
To view, visit https://gerrit.wikimedia.org/r/386409
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2f2bfb4f68e9a9d7656751001332c0a1ea86d282
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Cooltey <[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
