BearND has uploaded a new change for review.
https://gerrit.wikimedia.org/r/197851
Change subject: WIP: Add Talk link at bottom of page
......................................................................
WIP: Add Talk link at bottom of page
Currently hard-coded for enwiki.
Styles need to be improved.
Change-Id: I39e5b18d5c96def6b9ac41a0fead92eeddf22712
---
M wikipedia/src/main/java/org/wikipedia/PageTitle.java
M
wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
2 files changed, 19 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/51/197851/1
diff --git a/wikipedia/src/main/java/org/wikipedia/PageTitle.java
b/wikipedia/src/main/java/org/wikipedia/PageTitle.java
index 019cb47..9f72691 100644
--- a/wikipedia/src/main/java/org/wikipedia/PageTitle.java
+++ b/wikipedia/src/main/java/org/wikipedia/PageTitle.java
@@ -198,6 +198,21 @@
}
}
+ public String getPrefixedUri(String prefix) {
+ try {
+ return String.format(
+ "%1$s://%2$s/wiki/%3$s:%4$s",
+ WikipediaApp.getInstance().getNetworkProtocol(),
+ getSite().getDomain(),
+ prefix,
+ URLEncoder.encode(getPrefixedText().replace(" ", "_"),
"utf-8")
+ );
+ } catch (UnsupportedEncodingException e) {
+ // This shouldn't happen
+ throw new RuntimeException(e);
+ }
+ }
+
public String getPrefixedText() {
return namespace == null ? text : namespace + ":" + text;
}
diff --git
a/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
b/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
index c4ebd80..c8441e6 100644
---
a/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
+++
b/wikipedia/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
@@ -233,7 +233,10 @@
+ "\">" + activity.getString(R.string.last_updated_text,
Utils.formatDateRelative(page.getPageProperties().getLastModified())
+ "</a>");
- pageLastUpdatedText.setText(Html.fromHtml(lastUpdatedHtml));
+ // TODO: get correct prefix for other wiki sites. Talk only works
on enwiki.
+ String discussionHtml = "<a href=\"" +
page.getTitle().getPrefixedUri("Talk")
+ + "\">Talk</a>";
+ pageLastUpdatedText.setText(Html.fromHtml(lastUpdatedHtml + " -- "
+ discussionHtml));
pageLastUpdatedText.setMovementMethod(new
LinkMovementMethodExt(linkHandler));
}
}
--
To view, visit https://gerrit.wikimedia.org/r/197851
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I39e5b18d5c96def6b9ac41a0fead92eeddf22712
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
