jenkins-bot has submitted this change and it was merged.
Change subject: i18n: Add PLURAL/GENDER support to revreview-reject-summary-*
......................................................................
i18n: Add PLURAL/GENDER support to revreview-reject-summary-*
Spotted by Purodha
Change-Id: I0029ffa898120e529d095f8c1651dbcd1b3c9889
---
M frontend/RejectConfirmationFormUI.php
M i18n/revisionreview/en.json
M i18n/revisionreview/qqq.json
3 files changed, 93 insertions(+), 82 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
Siebrand: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/frontend/RejectConfirmationFormUI.php
b/frontend/RejectConfirmationFormUI.php
index 5e0c663..025b144 100755
--- a/frontend/RejectConfirmationFormUI.php
+++ b/frontend/RejectConfirmationFormUI.php
@@ -62,6 +62,8 @@
$rejectAuthors[] = $rev->isDeleted(
Revision::DELETED_USER )
? wfMessage( 'rev-deleted-user'
)->text()
:
"[[{$contribs}/{$rev->getUserText()}|{$rev->getUserText()}]]";
+ // Used for GENDER support for
revreview-reject-summary-*
+ $lastRejectAuthor = $rev->getUserText();
}
$lastTextId = $rev->getTextId();
}
@@ -97,9 +99,13 @@
$comment = $this->form->getComment(); // convenience
// Determine the default edit summary...
- $oldRevAuthor = $oldRev->isDeleted( Revision::DELETED_USER )
- ? wfMessage( 'rev-deleted-user' )->text()
- : $oldRev->getUserText();
+ if ( $oldRev->isDeleted( Revision::DELETED_USER ) ) {
+ $oldRevAuthor = wfMessage( 'rev-deleted-user' )->text();
+ $oldRevAuthorUsername = '.';
+ } else {
+ $oldRevAuthor = $oldRev->getUserText();
+ $oldRevAuthorUsername = $oldRevAuthor;
+ }
// NOTE: *-cur msg wording not safe for (unlikely) edit
auto-merge
$msg = $newRev->isCurrent()
? 'revreview-reject-summary-cur'
@@ -108,7 +114,10 @@
$wgContLang->formatNum( count( $rejectIds ) ),
$wgContLang->listToText( $rejectAuthors ),
$oldRev->getId(),
- $oldRevAuthor )->inContentLanguage()->text();
+ $oldRevAuthor,
+ count( $rejectAuthors ) === 1 ? $lastRejectAuthor : '.',
+ $oldRevAuthorUsername
+ )->numParams( count( $rejectAuthors )
)->inContentLanguage()->text();
// If the message is too big, then fallback to the shorter one
$colonSeparator = wfMessage( 'colon-separator' )->text();
$maxLen = 255 - count( $colonSeparator ) - count( $comment );
@@ -119,7 +128,9 @@
$defaultSummary = wfMessage( $msg,
$wgContLang->formatNum( count( $rejectIds ) ),
$oldRev->getId(),
- $oldRevAuthor )->inContentLanguage()->text();
+ $oldRevAuthor,
+ $oldRevAuthorUsername
+ )->inContentLanguage()->text();
}
// Append any review comment...
if ( $comment != '' ) {
diff --git a/i18n/revisionreview/en.json b/i18n/revisionreview/en.json
index 12e4c60..4f6cbeb 100644
--- a/i18n/revisionreview/en.json
+++ b/i18n/revisionreview/en.json
@@ -1,75 +1,75 @@
{
- "@metadata": {
- "authors": [
- "Purodha",
- "Raimond Spekking",
- "Siebrand"
- ]
- },
- "revisionreview": "Review revisions",
- "revreview-failed": "'''Unable to review this revision.'''",
- "revreview-submission-invalid": "The submission was incomplete or
otherwise invalid.",
- "review_page_invalid": "The target page title is invalid.",
- "review_page_notexists": "The target page does not exist.",
- "review_page_unreviewable": "The target page is not reviewable.",
- "review_no_oldid": "No revision ID specified.",
- "review_bad_oldid": "The target revision does not exist.",
- "review_conflict_oldid": "Someone already accepted or unaccepted this
revision while you were viewing it.",
- "review_not_flagged": "The target revision is not currently marked as
reviewed.",
- "review_too_low": "Revision cannot be reviewed with some fields left
\"inadequate\".",
- "review_bad_key": "Invalid inclusion parameter key.",
- "review_bad_tags": "Some of the specified tag values are invalid.",
- "review_denied": "Permission denied.",
- "review_param_missing": "A parameter is missing or invalid.",
- "review_cannot_undo": "Cannot undo these changes because further pending
edits changed the same areas.",
- "review_cannot_reject": "Cannot reject these changes because someone
already accepted some (or all) of the edits.",
- "review_reject_excessive": "Cannot reject this many edits at once.",
- "review_reject_nulledits": "Cannot reject these changes because all the
revisions are null edits.",
- "revreview-check-flag-p": "Accept this version (includes $1 pending
{{PLURAL:$1|change|changes}})",
- "revreview-check-flag-p-title": "Accept the result of the pending changes
and the changes you made here. Use this only if you have already seen the
entire pending changes diff.",
- "revreview-check-flag-u": "Accept this unreviewed page",
- "revreview-check-flag-u-title": "Accept this version of the page. Only use
this if you have already seen the entire page.",
- "revreview-check-flag-y": "Accept my changes",
- "revreview-check-flag-y-title": "Accept all the changes that you have made
here.",
- "revreview-flag": "Review this revision",
- "revreview-reflag": "Re-review this revision",
- "revreview-invalid": "'''Invalid target:''' no
[[{{MediaWiki:Validationpage}}|reviewed]] revision corresponds to the given
ID.",
- "revreview-log": "Comment:",
- "revreview-main": "You must select a particular revision of a content page
in order to review.\n\nSee the [[Special:Unreviewedpages|list of unreviewed
pages]].",
- "revreview-stable1": "You may want to view [{{fullurl:$1|stableid=$2}}
this flagged version] and see if it is now the [{{fullurl:$1|stable=1}} stable
version] of this page.",
- "revreview-stable2": "You may want to view the [{{fullurl:$1|stable=1}}
stable version] of this page.",
- "revreview-submit": "Submit",
- "revreview-submitting": "Submitting...",
- "revreview-submit-review": "Accept revision",
- "revreview-submit-unreview": "Unaccept revision",
- "revreview-submit-reject": "Reject changes",
- "revreview-submit-reviewed": "Done. Accepted!",
- "revreview-submit-unreviewed": "Done. Unaccepted!",
- "revreview-successful": "'''Revision of [[:$1|$1]] successfully flagged.
([{{fullurl:{{#Special:ReviewedVersions}}|page=$2}} view reviewed
versions])'''",
- "revreview-successful2": "'''Revision of [[:$1|$1]] successfully
unflagged.'''",
- "revreview-poss-conflict-p": "'''Warning: [[User:$1|$1]] started reviewing
this page on $2 at $3.'''",
- "revreview-poss-conflict-c": "'''Warning: [[User:$1|$1]] started reviewing
these changes on $2 at $3.'''",
- "revreview-adv-reviewing-p": "Notice: Other reviewers can see that
{{GENDER:$1|you}} are reviewing this page.",
- "revreview-adv-reviewing-c": "Notice: Other reviewers can see that
{{GENDER:$1|you}} are reviewing these changes.",
- "revreview-sadv-reviewing-p": "You can $1 yourself as reviewing this page
to other users.",
- "revreview-sadv-reviewing-c": "You can $1 yourself as reviewing these
changes to other users.",
- "revreview-adv-start-link": "advertise",
- "revreview-adv-stop-link": "de-advertise",
- "revreview-toolow": "'''You must rate each of the attributes higher than
\"inadequate\" in order for a revision to be considered reviewed.'''\n\nTo
remove the review status of a revision, click
\"{{int:revreview-submit-unreview}}\".\n\nPlease hit the \"back\" button in
your browser and try again.",
- "revreview-update": "'''Please [[{{MediaWiki:Validationpage}}|review]] any
pending changes ''(shown below)'' made since the stable version.'''",
- "revreview-update-edited": "<span class=\"flaggedrevs_important\">Your
changes are not yet in the stable version.</span>\n\nPlease review all the
changes shown below to make your edits appear in the stable version.",
- "revreview-update-edited-prev": "<span
class=\"flaggedrevs_important\">Your changes are not yet in the stable version.
There are previous changes pending review.</span>\n\nPlease review all the
changes shown below to make your edits appear in the stable version.",
- "revreview-update-includes": "Templates/files updated (unreviewed pages in
bold):",
- "revreview-reject-text-list": "By completing this action you will be
'''rejecting''' the source text changes from the following
{{PLURAL:$1|revision|revisions}} of [[:$2|$2]]:",
- "revreview-reject-text-revto": "This will revert the page back to the
[{{fullurl:$1|oldid=$2}} version as of $3].",
- "revreview-reject-summary": "Summary:",
- "revreview-reject-confirm": "Reject these changes",
- "revreview-reject-cancel": "Cancel",
- "revreview-reject-summary-cur": "Rejected the last {{PLURAL:$1|text
change|$1 text changes}} (by $2) and restored revision $3 by $4",
- "revreview-reject-summary-old": "Rejected the first {{PLURAL:$1|text
change|$1 text changes}} (by $2) that followed revision $3 by $4",
- "revreview-reject-summary-cur-short": "Rejected the last {{PLURAL:$1|text
change|$1 text changes}} and restored revision $2 by $3",
- "revreview-reject-summary-old-short": "Rejected the first {{PLURAL:$1|text
change|$1 text changes}} that followed revision $2 by $3",
- "revreview-tt-flag": "Accept this revision by marking it as \"checked\"",
- "revreview-tt-unflag": "Unaccept this revision by marking it as
\"unchecked\"",
- "revreview-tt-reject": "Reject these source text changes by reverting them"
+ "@metadata": {
+ "authors": [
+ "Purodha",
+ "Raimond Spekking",
+ "Siebrand"
+ ]
+ },
+ "revisionreview": "Review revisions",
+ "revreview-failed": "'''Unable to review this revision.'''",
+ "revreview-submission-invalid": "The submission was incomplete or
otherwise invalid.",
+ "review_page_invalid": "The target page title is invalid.",
+ "review_page_notexists": "The target page does not exist.",
+ "review_page_unreviewable": "The target page is not reviewable.",
+ "review_no_oldid": "No revision ID specified.",
+ "review_bad_oldid": "The target revision does not exist.",
+ "review_conflict_oldid": "Someone already accepted or unaccepted this
revision while you were viewing it.",
+ "review_not_flagged": "The target revision is not currently marked as
reviewed.",
+ "review_too_low": "Revision cannot be reviewed with some fields left
\"inadequate\".",
+ "review_bad_key": "Invalid inclusion parameter key.",
+ "review_bad_tags": "Some of the specified tag values are invalid.",
+ "review_denied": "Permission denied.",
+ "review_param_missing": "A parameter is missing or invalid.",
+ "review_cannot_undo": "Cannot undo these changes because further
pending edits changed the same areas.",
+ "review_cannot_reject": "Cannot reject these changes because someone
already accepted some (or all) of the edits.",
+ "review_reject_excessive": "Cannot reject this many edits at once.",
+ "review_reject_nulledits": "Cannot reject these changes because all the
revisions are null edits.",
+ "revreview-check-flag-p": "Accept this version (includes $1 pending
{{PLURAL:$1|change|changes}})",
+ "revreview-check-flag-p-title": "Accept the result of the pending
changes and the changes you made here. Use this only if you have already seen
the entire pending changes diff.",
+ "revreview-check-flag-u": "Accept this unreviewed page",
+ "revreview-check-flag-u-title": "Accept this version of the page. Only
use this if you have already seen the entire page.",
+ "revreview-check-flag-y": "Accept my changes",
+ "revreview-check-flag-y-title": "Accept all the changes that you have
made here.",
+ "revreview-flag": "Review this revision",
+ "revreview-reflag": "Re-review this revision",
+ "revreview-invalid": "'''Invalid target:''' no
[[{{MediaWiki:Validationpage}}|reviewed]] revision corresponds to the given
ID.",
+ "revreview-log": "Comment:",
+ "revreview-main": "You must select a particular revision of a content
page in order to review.\n\nSee the [[Special:Unreviewedpages|list of
unreviewed pages]].",
+ "revreview-stable1": "You may want to view [{{fullurl:$1|stableid=$2}}
this flagged version] and see if it is now the [{{fullurl:$1|stable=1}} stable
version] of this page.",
+ "revreview-stable2": "You may want to view the [{{fullurl:$1|stable=1}}
stable version] of this page.",
+ "revreview-submit": "Submit",
+ "revreview-submitting": "Submitting...",
+ "revreview-submit-review": "Accept revision",
+ "revreview-submit-unreview": "Unaccept revision",
+ "revreview-submit-reject": "Reject changes",
+ "revreview-submit-reviewed": "Done. Accepted!",
+ "revreview-submit-unreviewed": "Done. Unaccepted!",
+ "revreview-successful": "'''Revision of [[:$1|$1]] successfully
flagged. ([{{fullurl:{{#Special:ReviewedVersions}}|page=$2}} view reviewed
versions])'''",
+ "revreview-successful2": "'''Revision of [[:$1|$1]] successfully
unflagged.'''",
+ "revreview-poss-conflict-p": "'''Warning: [[User:$1|$1]] started
reviewing this page on $2 at $3.'''",
+ "revreview-poss-conflict-c": "'''Warning: [[User:$1|$1]] started
reviewing these changes on $2 at $3.'''",
+ "revreview-adv-reviewing-p": "Notice: Other reviewers can see that
{{GENDER:$1|you}} are reviewing this page.",
+ "revreview-adv-reviewing-c": "Notice: Other reviewers can see that
{{GENDER:$1|you}} are reviewing these changes.",
+ "revreview-sadv-reviewing-p": "You can $1 yourself as reviewing this
page to other users.",
+ "revreview-sadv-reviewing-c": "You can $1 yourself as reviewing these
changes to other users.",
+ "revreview-adv-start-link": "advertise",
+ "revreview-adv-stop-link": "de-advertise",
+ "revreview-toolow": "'''You must rate each of the attributes higher
than \"inadequate\" in order for a revision to be considered reviewed.'''\n\nTo
remove the review status of a revision, click
\"{{int:revreview-submit-unreview}}\".\n\nPlease hit the \"back\" button in
your browser and try again.",
+ "revreview-update": "'''Please [[{{MediaWiki:Validationpage}}|review]]
any pending changes ''(shown below)'' made since the stable version.'''",
+ "revreview-update-edited": "<span class=\"flaggedrevs_important\">Your
changes are not yet in the stable version.</span>\n\nPlease review all the
changes shown below to make your edits appear in the stable version.",
+ "revreview-update-edited-prev": "<span
class=\"flaggedrevs_important\">Your changes are not yet in the stable version.
There are previous changes pending review.</span>\n\nPlease review all the
changes shown below to make your edits appear in the stable version.",
+ "revreview-update-includes": "Templates/files updated (unreviewed pages
in bold):",
+ "revreview-reject-text-list": "By completing this action you will be
'''rejecting''' the source text changes from the following
{{PLURAL:$1|revision|revisions}} of [[:$2|$2]]:",
+ "revreview-reject-text-revto": "This will revert the page back to the
[{{fullurl:$1|oldid=$2}} version as of $3].",
+ "revreview-reject-summary": "Summary:",
+ "revreview-reject-confirm": "Reject these changes",
+ "revreview-reject-cancel": "Cancel",
+ "revreview-reject-summary-cur": "Rejected the last {{PLURAL:$1|text
change|$1 text changes}} ({{PLURAL:$7|{{GENDER:$5|by}}}} $2) and restored
revision $3 {{GENDER:$6|by}} $4",
+ "revreview-reject-summary-old": "Rejected the first {{PLURAL:$1|text
change|$1 text changes}} ({{PLURAL:$7|{{GENDER:$5|by}}}} $2) that followed
revision $3 {{GENDER:$6|by}} $4",
+ "revreview-reject-summary-cur-short": "Rejected the last
{{PLURAL:$1|text change|$1 text changes}} and restored revision $2
{{GENDER:$4|by}} $3",
+ "revreview-reject-summary-old-short": "Rejected the first
{{PLURAL:$1|text change|$1 text changes}} that followed revision $2
{{GENDER:$4|by}} $3'",
+ "revreview-tt-flag": "Accept this revision by marking it as
\"checked\"",
+ "revreview-tt-unflag": "Unaccept this revision by marking it as
\"unchecked\"",
+ "revreview-tt-reject": "Reject these source text changes by reverting
them"
}
\ No newline at end of file
diff --git a/i18n/revisionreview/qqq.json b/i18n/revisionreview/qqq.json
index d125d57..e785fae 100644
--- a/i18n/revisionreview/qqq.json
+++ b/i18n/revisionreview/qqq.json
@@ -82,10 +82,10 @@
"revreview-reject-summary": "{{Flagged Revs}}\nShown on the reject
form.\n{{Identical|Summary}}",
"revreview-reject-confirm": "{{Flagged Revs}}\nShown on the reject
form. Confirmation button to reject unreviewed changes.",
"revreview-reject-cancel": "{{Flagged Revs}}\nShown on the reject
form.\n{{Identical|Cancel}}",
- "revreview-reject-summary-cur": "{{Flagged Revs-small}}\nDefault
summary shown when rejecting pending changes, and they are the latest revisions
to a page\n* $1 - the number of rejected revisions\n* $2 - the list of of one
or more users whose changes are being rejected\n* $3 - the revision ID of the
revision being reverted to\n* $4 - the username or {{msg-mw|rev-deleted-user}}
(if the user has been deleted)",
- "revreview-reject-summary-old": "{{Flagged Revs-small}}\nDefault
summary shown when rejecting pending changes.\n* $1 - the number of rejected
revisions\n* $2 - the list of (one or more) users who are being rejected\n* $3
- the revision ID of the revision before the first pending change\n* $4 - the
username or {{msg-mw|rev-deleted-user}} (if the user has been deleted)",
- "revreview-reject-summary-cur-short": "{{Flagged Revs-small}}\nDefault
summary shown when rejecting pending changes, and they are the latest revisions
to a page\n* $1 - the number of rejected revisions\n* $2 - the revision ID of
the revision being reverted to\n* $3 - the username or
{{msg-mw|rev-deleted-user}} (if the user has been deleted)",
- "revreview-reject-summary-old-short": "{{Flagged Revs-small}}\nDefault
summary shown when rejecting pending changes.\n* $1 - the number of rejected
revisions\n* $2 - the revision ID of the revision before the first pending
change\n* $3 - the username or {{msg-mw|rev-deleted-user}} (if the user has
been deleted)\nAlternative sentences which mean the same as the above message
are:\n* Rejected the next {{PLURAL:$1|change|$1 changes}} that followed
revision $2 by $3\n* Rejected the {{PLURAL:$1|change|$1 changes}} that
immediately followed revision $2 by $3",
+ "revreview-reject-summary-cur": "{{Flagged Revs-small}}\nDefault
summary shown when rejecting pending changes, and they are the latest revisions
to a page\n* $1 - the number of rejected revisions\n* $2 - the list of of one
or more users whose changes are being rejected\n* $3 - the revision ID of the
revision being reverted to\n* $4 - the username or {{msg-mw|rev-deleted-user}}
(if the user has been deleted)\n* $5 - a plain text username of the user whose
changes are being rejected or \".\" if multiple users, used for GENDER\n* $6 -
a plain text username of the author of the revision being reverted to, used for
GENDER\n* $7 - the number of users whose changes are being rejected, used for
PLURAL",
+ "revreview-reject-summary-old": "{{Flagged Revs-small}}\nDefault
summary shown when rejecting pending changes.\n* $1 - the number of rejected
revisions\n* $2 - the list of (one or more) users who are being rejected\n* $3
- the revision ID of the revision before the first pending change\n* $4 - the
username or {{msg-mw|rev-deleted-user}} (if the user has been deleted)\n* $5 -
a plain text username of the user whose changes are being rejected or \".\" if
multiple users, used for GENDER\n* $6 - a plain text username of the author of
the revision being reverted to, used for GENDER\n* $7 - the number of users
whose changes are being rejected, used for PLURAL",
+ "revreview-reject-summary-cur-short": "{{Flagged Revs-small}}\nDefault
summary shown when rejecting pending changes, and they are the latest revisions
to a page\n* $1 - the number of rejected revisions\n* $2 - the revision ID of
the revision being reverted to\n* $3 - the username or
{{msg-mw|rev-deleted-user}} (if the user has been deleted)\n* $4 - a plain text
username of the author of the revision being reverted to, used for GENDER",
+ "revreview-reject-summary-old-short": "{{Flagged Revs-small}}\nDefault
summary shown when rejecting pending changes.\n* $1 - the number of rejected
revisions\n* $2 - the revision ID of the revision before the first pending
change\n* $3 - the username or {{msg-mw|rev-deleted-user}} (if the user has
been deleted)\n* $4 - a plain text username of the author of the revision being
reverted to, used for GENDER\nAlternative sentences which mean the same as the
above message are:\n* Rejected the next {{PLURAL:$1|change|$1 changes}} that
followed revision $2 {{GENDER:$4|by}} $3\n* Rejected the {{PLURAL:$1|change|$1
changes}} that immediately followed revision $2 {{GENDER:$4|by}} $3",
"revreview-tt-flag": "{{Flagged Revs}}\nTitle attribute of the accept
button on the review form.",
"revreview-tt-unflag": "{{Flagged Revs}}\nTitle attribute of the
un-accept button on the review form.",
"revreview-tt-reject": "{{Flagged Revs}}\nTitle attribute of the reject
button on the review form."
--
To view, visit https://gerrit.wikimedia.org/r/103119
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0029ffa898120e529d095f8c1651dbcd1b3c9889
Gerrit-PatchSet: 11
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: master
Gerrit-Owner: MegaAlex <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: MegaAlex <[email protected]>
Gerrit-Reviewer: Nemo bis <[email protected]>
Gerrit-Reviewer: Nikerabbit <[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
