From b121b6c1babab9af50af32b8e17cde157f833016 Mon Sep 17 00:00:00 2001 From: Purodha Date: Wed, 27 Jul 2016 08:41:04 +0000 Subject: [PATCH] Add GENDER to rollback-success message Bug: T141250 Change-Id: I99c2b5ad5594b25928ad5bfd3f3a36b19a2c041c --- includes/actions/RollbackAction.php | 10 ++++++++-- languages/i18n/en.json | 2 +- languages/i18n/qqq.json | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/includes/actions/RollbackAction.php b/includes/actions/RollbackAction.php index aa2858d8e3..9d336e4613 100644 --- a/includes/actions/RollbackAction.php +++ b/includes/actions/RollbackAction.php @@ -41,6 +41,7 @@ class RollbackAction extends FormlessAction { * - confirm-rollback-button * - rollbackfailed * - rollback-missingparam + * - rollback-success-notify */ /** @@ -123,8 +124,13 @@ class RollbackAction extends FormlessAction { $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 b3781c256d..8cd9eb880f 100644 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@ -2160,7 +2160,7 @@ "editcomment": "The edit summary was: $1.", "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 4ec5cec5fa..02188c8997 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}}.", -- 2.20.1