jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/301337 )
Change subject: Add GENDER to rollback-success message
......................................................................
Add GENDER to rollback-success message
Bug: T141250
Change-Id: I99c2b5ad5594b25928ad5bfd3f3a36b19a2c041c
---
M includes/actions/RollbackAction.php
M languages/i18n/en.json
M languages/i18n/qqq.json
3 files changed, 10 insertions(+), 4 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/actions/RollbackAction.php
b/includes/actions/RollbackAction.php
index aa2858d..9d336e4 100644
--- a/includes/actions/RollbackAction.php
+++ b/includes/actions/RollbackAction.php
@@ -41,6 +41,7 @@
* - confirm-rollback-button
* - rollbackfailed
* - rollback-missingparam
+ * - rollback-success-notify
*/
/**
@@ -123,8 +124,13 @@
$old = Linker::revUserTools( $current );
$new = Linker::revUserTools( $target );
- $this->getOutput()->addHTML( $this->msg( 'rollback-success'
)->rawParams( $old, $new )
- ->parseAsBlock() );
+ $this->getOutput()->addHTML(
+ $this->msg( 'rollback-success' )
+ ->rawParams( $old, $new )
+ ->params( $current->getUserText(
Revision::FOR_THIS_USER, $user ) )
+ ->params( $target->getUserText(
Revision::FOR_THIS_USER, $user ) )
+ ->parseAsBlock()
+ );
if ( $user->getBoolOption( 'watchrollback' ) ) {
$user->addWatch( $this->page->getTitle(),
User::IGNORE_USER_RIGHTS );
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index b3781c2..8cd9eb8 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -2160,7 +2160,7 @@
"editcomment": "The edit summary was: <em>$1</em>.",
"revertpage": "Reverted edits by [[Special:Contributions/$2|$2]]
([[User talk:$2|talk]]) to last revision by [[User:$1|$1]]",
"revertpage-nouser": "Reverted edits by a hidden user to last revision
by {{GENDER:$1|[[User:$1|$1]]}}",
- "rollback-success": "Reverted edits by $1;\nchanged back to last
revision by $2.",
+ "rollback-success": "Reverted edits by {{GENDER:$3|$1}};\nchanged back
to last revision by {{GENDER:$4|$2}}.",
"rollback-success-notify": "Reverted edits by $1;\nchanged back to last
revision by $2. [$3 Show changes]",
"sessionfailure-title": "Session failure",
"sessionfailure": "There seems to be a problem with your login
session;\nthis action has been canceled as a precaution against session
hijacking.\nGo back to the previous page, reload that page and then try again.",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index 4ec5cec..02188c8 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -2344,7 +2344,7 @@
"editcomment": "Only shown if there is an edit {{msg-mw|Summary}}.
Parameters:\n* $1 - the edit summary",
"revertpage": "Parameters:\n* $1 - username 1\n* $2 - username 2\n* $3
- (Optional) revision ID of the revision reverted to\n* $4 - (Optional)
timestamp of the revision reverted to\n* $5 - (Optional) revision ID of the
revision reverted from\n* $6 - (Optional) timestamp of the revision reverted
from\nSee also:\n* {{msg-mw|Revertpage-nouser}}\n{{Identical|Revert}}",
"revertpage-nouser": "This is a confirmation message a user sees after
reverting, when the username of the version is hidden with
RevisionDelete.\n\nIn other cases the message {{msg-mw|Revertpage}} is
used.\n\nParameters:\n* $1 - username 1, can be used for GENDER\n* $2 -
(Optional) username 2\n* $3 - (Optional) revision ID of the revision reverted
to\n* $4 - (Optional) timestamp of the revision reverted to\n* $5 - (Optional)
revision ID of the revision reverted from\n* $6 - (Optional) timestamp of the
revision reverted from",
- "rollback-success": "This message shows up on screen after successful
revert (generally visible only to admins). $1 describes user whose changes have
been reverted, $2 describes user which produced version, which replaces
reverted version.\n{{Identical|Revert}}\n{{Identical|Rollback}}",
+ "rollback-success": "This message shows up on screen after successful
revert (generally visible only to admins). Parameters:\n* $1 - user whose
changes have been reverted\n* $2 - user who produced version, which replaces
reverted version\n* $3 - the first user's name, can be used for GENDER\n* $4 -
the second user's name, can be used for
GENDER\n{{Identical|Revert}}\n{{Identical|Rollback}}",
"rollback-success-notify": "Notification shown after a successful
revert.\n* $1 - User whose changes have been reverted\n* $2 - User that made
the edit that was restored\n* $3 - Url to the diff of the rollback\nSee
also:\n*
{{msg-mw|showdiff}}\n{{related|rollback-success}}\n{{Format|jquerymsg}}",
"sessionfailure-title": "Used as title of the error message
{{msg-mw|Sessionfailure}}.",
"sessionfailure": "Used as error message.\n\nThe title for this error
message is {{msg-mw|Sessionfailure-title}}.",
--
To view, visit https://gerrit.wikimedia.org/r/301337
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I99c2b5ad5594b25928ad5bfd3f3a36b19a2c041c
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Purodha <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: Matěj Suchánek <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: Raimond Spekking <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: Zppix <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
