jenkins-bot has submitted this change and it was merged. Change subject: Add GENDER support for log and status messages. ......................................................................
Add GENDER support for log and status messages. https://translatewiki.net/wiki/Thread:Support/%27user%27_in_Extension:Renameuser Change-Id: I3ed842d516d22cc0ef984ceb1fb8d12c5b7f8225 --- M RenameuserLogFormatter.php M i18n/en.json M i18n/qqq.json 3 files changed, 16 insertions(+), 12 deletions(-) Approvals: Umherirrender: Looks good to me, approved jenkins-bot: Verified diff --git a/RenameuserLogFormatter.php b/RenameuserLogFormatter.php index 2728902..23831bc 100644 --- a/RenameuserLogFormatter.php +++ b/RenameuserLogFormatter.php @@ -9,12 +9,13 @@ $params = parent::getMessageParameters(); /* Current format: * 1,2,3: normal logformatter params - * 4: old username + * 4: old username (linked) * (legaciest doesn't have this at all, all in comment) * (legacier uses this as new name and stores old name in target) - * 5: new username + * 5: new username (linked) * 6: number of edits the user had at the time * (not available except in newest log entries) + * 7: new username (raw format for GENDER) * Note that the arrays are zero-indexed, while message parameters * start from 1, so substract one to get array entries below. */ @@ -37,6 +38,8 @@ $title = Title::makeTitleSafe( NS_USER, $params[4] ); $link = $this->myPageLink( $title, $params[4] ); $params[4] = Message::rawParam( $link ); + // GENDER support (using new user page) + $params[6] = $title->getText(); return $params; } diff --git a/i18n/en.json b/i18n/en.json index fb33073..65cc584 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -18,20 +18,20 @@ "renameusersubmit": "Submit", "renameuser-submit-blocklog": "Show block log for user", "renameusererrordoesnotexist": "The user \"<nowiki>$1</nowiki>\" does not exist.", - "renameusererrorexists": "The user \"<nowiki>$1</nowiki>\" already exists.", + "renameusererrorexists": "The {{GENDER:$1|user}} \"<nowiki>$1</nowiki>\" already exists.", "renameusererrorinvalid": "The username \"<nowiki>$1</nowiki>\" is invalid.", "renameuser-error-request": "There was a problem with receiving the request.\nPlease go back and try again.", "renameuser-error-same-user": "You cannot rename a user to the same thing as before.", - "renameusersuccess": "The user \"<nowiki>$1</nowiki>\" has been renamed to \"<nowiki>$2</nowiki>\".", + "renameusersuccess": "The {{GENDER:$2|user}} \"<nowiki>$1</nowiki>\" has been renamed to \"<nowiki>$2</nowiki>\".", "renameuser-page-exists": "The page $1 already exists and cannot be automatically overwritten.", "renameuser-page-moved": "The page $1 has been moved to $2.", "renameuser-page-unmoved": "The page $1 could not be moved to $2.", "log-name-renameuser": "User rename log", "log-description-renameuser": "This is a log of changes to user names.", - "logentry-renameuser-renameuser": "$1 {{GENDER:$2|renamed}} user $4 ({{PLURAL:$6|$6 edit|$6 edits}}) to $5", - "logentry-renameuser-renameuser-legacier": "$1 renamed user $4 to $5", + "logentry-renameuser-renameuser": "$1 {{GENDER:$2|renamed}} user $4 ({{PLURAL:$6|$6 edit|$6 edits}}) to {{GENDER:$7|$5}}", + "logentry-renameuser-renameuser-legacier": "$1 renamed user $4 to {{GENDER:$7|$5}}", "logentry-renameuser-renameuser-legaciest": "$1", - "renameuser-move-log": "Automatically moved page while renaming the user \"[[User:$1|$1]]\" to \"[[User:$2|$2]]\"", + "renameuser-move-log": "Automatically moved page while renaming the {{GENDER:$2|user}} \"[[User:$1|$1]]\" to \"[[User:$2|$2]]\"", "action-renameuser": "rename users", "right-renameuser": "Rename users", "renameuser-renamed-notice": "This user has been renamed.\nThe rename log is provided below for reference." diff --git a/i18n/qqq.json b/i18n/qqq.json index 2ceff6e..1578fa0 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -9,6 +9,7 @@ "SPQRobin", "Shirayuki", "Siebrand", + "Tacsipacsi", "The Evil IP address", "Umherirrender" ] @@ -29,20 +30,20 @@ "renameusersubmit": "Used as label for the Submit button in the \"Rename user\" form in [[Special:RenameUser]].\n{{Identical|Submit}}", "renameuser-submit-blocklog": "Button text. When clicked, the block log entries for a given user will be displayed.", "renameusererrordoesnotexist": "Used as error message. Parameters:\n* $1 - username\nSee also:\n* {{msg-mw|Renameusererrorexists}}", - "renameusererrorexists": "Used as error message. Parameters:\n* $1 - username\nSee also:\n* {{msg-mw|Renameusererrordoesnotexist}}", + "renameusererrorexists": "Used as error message. Parameters:\n* $1 - username, can be used for GENDER\nSee also:\n* {{msg-mw|Renameusererrordoesnotexist}}", "renameusererrorinvalid": "Used as error message when renaming user in [[Special:Renameuser]]. Parameters:\n* $1 - old username, or new username", "renameuser-error-request": "Used as error message when renaming user in [[Special:Renameuser]].", "renameuser-error-same-user": "Used as error message when renaming user in [[Special:Renameuser]].", - "renameusersuccess": "Used as success message when renaming user in [[Special:Renameuser]]. Parameters:\n* $1 - old username\n* $2 - new username", + "renameusersuccess": "Used as success message when renaming user in [[Special:Renameuser]]. Parameters:\n* $1 - old username\n* $2 - new username, can be used for GENDER", "renameuser-page-exists": "Used when renaming user in [[Special:Renameuser]]. Parameters:\n* $1 - new page title (with link)", "renameuser-page-moved": "Used as success message when renaming user in [[Special:Renameuser]]. Parameters:\n* $1 - old page title (with link)\n* $2 - new page title (with link)\nSee also:\n* {{msg-mw|Renameuser-page-unmoved}}", "renameuser-page-unmoved": "Used as failure message when renaming user in [[Special:Renameuser]]. Parameters:\n* $1 - old page title (with link)\n* $2 - new page title (with link)\nSee also:\n* {{msg-mw|Renameuser-page-moved}}", "log-name-renameuser": "{{doc-logpage}}\n\nAs well as log page title and page header for [[Special:Log/renameuser]].", "log-description-renameuser": "Log description on [[Special:Log/renameuser]].", - "logentry-renameuser-renameuser": "{{logentry|[[Special:Log/renameuser]]}}\nParameters:\n* $4 - the old name of the renamed user\n* $5 - the new name of the renamed user\n* $6 - number of edits made by the user", - "logentry-renameuser-renameuser-legacier": "{{logentry|[[Special:Log/renameuser]]}}\nParameters:\n* $4 - the old name of the renamed user\n* $5 - the new name of the renamed user", + "logentry-renameuser-renameuser": "{{logentry|[[Special:Log/renameuser]]}}\nParameters:\n* $4 - the old name of the renamed user\n* $5 - the new name of the renamed user\n* $6 - number of edits made by the user\n* $7 - (Optional) new username, for GENDER support", + "logentry-renameuser-renameuser-legacier": "{{logentry|[[Special:Log/renameuser]]}}\nParameters:\n* $4 - the old name of the renamed user\n* $5 - the new name of the renamed user\n* $7 - (Optional) new username, for GENDER support", "logentry-renameuser-renameuser-legaciest": "Used in [[Special:Log/renameuser]]. {{logentry}}\nNote that only user name is included in this legacy log entry, everything else is hardcoded into log comment.", - "renameuser-move-log": "Reason for a page move when a page is moved because of a user rename. Parameters:\n* $1 - the old username\n* $2 - the new username", + "renameuser-move-log": "Reason for a page move when a page is moved because of a user rename. Parameters:\n* $1 - the old username\n* $2 - the new username, can be used for GENDER", "action-renameuser": "{{Doc-action|renameuser}}\n{{Identical|Rename user}}", "right-renameuser": "{{doc-right|renameuser}}\n{{Identical|Rename user}}", "renameuser-renamed-notice": "Parameters:\n* $1 - (Optional) username, for GENDER support" -- To view, visit https://gerrit.wikimedia.org/r/262129 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3ed842d516d22cc0ef984ceb1fb8d12c5b7f8225 Gerrit-PatchSet: 6 Gerrit-Project: mediawiki/extensions/Renameuser Gerrit-Branch: master Gerrit-Owner: Tacsipacsi <[email protected]> Gerrit-Reviewer: Nemo bis <[email protected]> Gerrit-Reviewer: PranavK <[email protected]> Gerrit-Reviewer: Siebrand <[email protected]> Gerrit-Reviewer: Tacsipacsi <[email protected]> Gerrit-Reviewer: Umherirrender <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
