jenkins-bot has submitted this change and it was merged.
Change subject: Include edit summary in permalink
......................................................................
Include edit summary in permalink
Update the revision-info and revision-info-current messages to include the
edit summary of the revision being viewed via the permalink.
Change-Id: Ie19adfa5e780f2cfeeaba0f117d9007fc3cecd7e
---
M includes/Article.php
M languages/i18n/en.json
M languages/i18n/qqq.json
3 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
Siebrand: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/includes/Article.php b/includes/Article.php
index 3bb1563..4663099 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -1366,7 +1366,7 @@
$outputPage = $this->getContext()->getOutput();
$outputPage->addSubtitle( "<div id=\"mw-{$infomsg}\">" .
wfMessage( $infomsg,
$td )->rawParams( $userlinks )->params(
$revision->getID(), $tddate,
- $tdtime, $revision->getUser() )->parse() . "</div>" );
+ $tdtime, $revision->getUser(), Linker::revComment(
$revision, true, true ) )->parse() . "</div>" );
$lnk = $current
? wfMessage( 'currentrevisionlink' )->escaped()
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 1c617f7..534b859 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -737,7 +737,7 @@
"currentrev": "Latest revision",
"currentrev-asof": "Latest revision as of $1",
"revisionasof": "Revision as of $1",
- "revision-info": "Revision as of $1 by $2",
+ "revision-info": "Revision as of $1 by {{GENDER:$6|$2}}$7",
"revision-info-current": "-",
"revision-nav": "($1) $2{{int:pipe-separator}}$3
($4){{int:pipe-separator}}$5 ($6)",
"previousrevision": "← Older revision",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index 1e6cc0f..edf0a80 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -897,8 +897,8 @@
"currentrev": "Used in Diff Preview page. The diff is between
{{msg-mw|currentrev}} and {{msg-mw|yourtext}}.\n{{Identical|Current revision}}",
"currentrev-asof": "Used on a difference page when comparing the
current versions of a page with each other.\n\nSee {{msg-mw|Revisionasof}} for
the message for non-current version.\n\nParameters:\n* $1 - a date and time\n*
$2 - (Optional) a date\n* $3 - (Optional) a time",
"revisionasof": "Used on a difference page when comparing different
versions of a page or when viewing an non-current version of a page.\n\nSee
{{msg-mw|Currentrev-asof}} for the message for the current
version.\n\nParameters:\n* $1 - the date/time at which the revision was
created. e.g. \"''Revision as of 14:44, 24 January 2008''\".\n* $2 - (Optional)
the date at which the revision was created\n* $3 - (Optional) the time at which
the revision was created",
- "revision-info": "Appears just below the page title when an old version
of the page is being viewed.\n\nParameters:\n* $1 - date and time of
revision\n* $2 - a series of links: to author of the revision, his talk page,
etc.\n* $3 - (Optional) revision ID\n* $4 - (Optional) date of revision\n* $5 -
(Optional) time of revision\n* $6 - (Optional) author of revision, for GENDER
use",
- "revision-info-current": "{{notranslate}}\n* $1: date and time of
revision\n* $2: a series of links: to author of the revision, his talk page,
etc. \n* (optional) $3: revision ID\n* (optional) $4: date of revision\n*
(optional) $5: time of revision\n* (optional) $6: author of revision, for
GENDER use",
+ "revision-info": "Appears just below the page title when an old version
of the page is being viewed.\n\nParameters:\n* $1 - date and time of
revision\n* $2 - a series of links: to author of the revision, his talk page,
etc.\n* $3 - (Optional) revision ID\n* $4 - (Optional) date of revision\n* $5 -
(Optional) time of revision\n* $6 - (Optional) author of revision, for GENDER
use\n* $7 - edit summary of revision (with leading space and in parentheses)",
+ "revision-info-current": "{{notranslate}}\n* $1: date and time of
revision\n* $2: a series of links: to author of the revision, his talk page,
etc. \n* (optional) $3: revision ID\n* (optional) $4: date of revision\n*
(optional) $5: time of revision\n* (optional) $6: author of revision, for
GENDER use\n* $7 - edit summary of revision (with leading space and in
parentheses)",
"revision-nav": "{{notranslate}}\nRefers to
{{msg-mw|Pipe-separator}}.\n\nParameters:\n* $1 - prev diff. link text is
{{msg-mw|Diff}}\n* $2 - prev link. link text is {{msg-mw|Previousrevision}}\n*
$3 - link. link text is {{msg-mw|Currentrevisionlink}}\n* $4 - cur diff. link
text is {{msg-mw|Diff}}\n* $5 - next link. link text is
{{msg-mw|Nextrevision}}\n* $6 - next diff. link text is {{msg-mw|Diff}}",
"previousrevision": "See also:\n* {{msg-mw|Nextrevision}}",
"nextrevision": "See also:\n* {{msg-mw|Previousrevision}}",
--
To view, visit https://gerrit.wikimedia.org/r/127442
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie19adfa5e780f2cfeeaba0f117d9007fc3cecd7e
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jackmcbarn <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Brian Wolff <[email protected]>
Gerrit-Reviewer: Jackmcbarn <[email protected]>
Gerrit-Reviewer: Parent5446 <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
