r63938 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r63937‎ | r63938 | r63939 >
Date:23:28, 18 March 2010
Author:aaron
Status:ok
Tags:
Comment:
* Avoiding use of "draft" word
* Removed unused revreview-draft-rev msg
* A few other assorted tweaks
Modified paths:
  • /trunk/extensions/FlaggedRevs/FlaggedArticleView.php (modified) (history)
  • /trunk/extensions/FlaggedRevs/language/FlaggedRevs.i18n.php (modified) (history)

Diff [purge]

Index: trunk/extensions/FlaggedRevs/language/FlaggedRevs.i18n.php
@@ -31,7 +31,7 @@
3232 'flaggedrevs-prefs-stable' => 'Always show the published version of content pages by default (if there is one)',
3333 'flaggedrevs-prefs-watch' => 'Add pages I review to my watchlist',
3434 'flaggedrevs-prefs-editdiffs' => 'Show the pending changes diff when editing pages',
35 - 'flaggedrevs-prefs-viewdiffs' => 'Show the pending changes diff when viewing page drafts',
 35+ 'flaggedrevs-prefs-viewdiffs' => 'Show the pending changes diff when viewing the latest page revision',
3636 'group-editor' => 'Editors',
3737 'group-editor-member' => 'editor',
3838 'group-reviewer' => 'Reviewers',
@@ -41,7 +41,7 @@
4242 'group-autoreview' => 'Autochecked users',
4343 'group-autoreview-member' => 'autochecked users',
4444 'grouppage-autoreview' => '{{ns:project}}:Autochecked users',
45 - 'revreview-hist-draft' => 'draft revision',
 45+ 'revreview-hist-draft' => 'unchecked revision',
4646 'revreview-hist-quality' => 'quality revision',
4747 'revreview-hist-quality-user' => '[{{fullurl:$1|stableid=$2}} approved] by [[User:$3|$3]]',
4848 'revreview-hist-basic' => 'checked revision',
@@ -52,7 +52,7 @@
5353 'review-edit-diff' => '\'\'\'NOTICE: Some pending changes to the published version are incorporated into the edit form below.\'\'\'',
5454 'revreview-diff-toggle-show' => '(show changes)',
5555 'revreview-diff-toggle-hide' => '(hide changes)',
56 - 'revreview-diff-toggle-title' => 'Toggle display of changes between draft and the published version',
 56+ 'revreview-diff-toggle-title' => 'Toggle display of pending changes to the published version',
5757 'revreview-log-toggle-show' => '(show stability log)',
5858 'revreview-log-details-show' => '(show details)',
5959 'review-diff2stable' => 'View pending changes to published version',
@@ -75,10 +75,10 @@
7676 'revreview-approved' => 'Approved',
7777 'revreview-auto' => '(automatic)',
7878 'revreview-basic' => 'This is the [[{{MediaWiki:Validationpage}}|published version]], [{{fullurl:{{#Special:Log}}|type=review&page={{FULLPAGENAMEE}}}} checked] on <i>$2</i>.
79 -The [{{fullurl:{{FULLPAGENAMEE}}|stable=0}} draft] contains [{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} $3 pending {{PLURAL:$3|change|changes}}].',
 79+There {{PLURAL:$3|is|are}} [{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} $3 pending {{PLURAL:$3|change|changes}}] awaiting review.',
8080 'revreview-basic-i' => 'This is the [[{{MediaWiki:Validationpage}}|published version]], [{{fullurl:{{#Special:Log}}|type=review&page={{FULLPAGENAMEE}}}} checked] on <i>$2</i>.
81 -The [{{fullurl:{{FULLPAGENAMEE}}|stable=0}} draft] contains [{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} template/file changes] awaiting review.',
82 - 'revreview-basic-old' => 'This is a [[{{MediaWiki:Validationpage}}|checked]] revision ([{{fullurl:{{#Special:ReviewedVersions}}|page={{FULLPAGENAMEE}}}} list all]), [{{fullurl:{{#Special:Log}}|type=review&page={{FULLPAGENAMEE}}}} approved] on <i>$2</i>.
 81+There are [{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} template/file changes] awaiting review.',
 82+ 'revreview-basic-old' => 'This is a [[{{MediaWiki:Validationpage}}|checked]] version ([{{fullurl:{{#Special:ReviewedVersions}}|page={{FULLPAGENAMEE}}}} list all]), [{{fullurl:{{#Special:Log}}|type=review&page={{FULLPAGENAMEE}}}} approved] on <i>$2</i>.
8383 New [{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} changes] may have been made.',
8484 'revreview-basic-same' => 'This is the [[{{MediaWiki:Validationpage}}|published version]], [{{fullurl:{{#Special:Log}}|type=review&page={{FULLPAGENAMEE}}}} checked] on <i>$2</i>.',
8585 'revreview-basic-source' => 'A [{{fullurl:{{FULLPAGENAMEE}}|stableid=$1}} checked version] of this page, [{{fullurl:{{#Special:Log}}|type=review&page={{FULLPAGENAMEE}}}} approved] on <i>$2</i>, was based off this revision.',
@@ -88,20 +88,20 @@
8989 A template or file may have been requested when no specific version was specified.
9090 This can happen if a dynamic template transcludes another file or template depending on a variable that changed since you started reviewing this page.
9191 Refreshing the page and rereviewing can solve this problem.',
92 - 'revreview-current' => 'Draft',
 92+ 'revreview-current' => 'Pending changes',
9393 'revreview-depth' => 'Depth',
9494 'revreview-depth-0' => 'Unapproved',
9595 'revreview-depth-1' => 'Basic',
9696 'revreview-depth-2' => 'Moderate',
9797 'revreview-depth-3' => 'High',
9898 'revreview-depth-4' => 'Featured',
99 - 'revreview-draft-title' => 'This is a draft page',
100 - 'revreview-draft-rev' => 'Draft revision',
 99+ 'revreview-draft-title' => 'Pending changes are displayed on this page',
101100 'revreview-edit' => 'Edit',
102101 'revreview-editnotice' => '\'\'\'Your changes will be [[{{MediaWiki:Validationpage}}|published]] once an authorised user [[{{MediaWiki:Validationpage}}|reviews]] them.\'\'\'',
103102 'revreview-check-flag' => 'Publish currently pending edits',
104103 'revreview-edited' => '\'\'\'Changes will be [[{{MediaWiki:Validationpage}}|published]] once an authorised user [[{{MediaWiki:Validationpage}}|reviews]] them.\'\'\'
105 -The \'\'draft\'\', shown below, contains [{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} $2 pending {{PLURAL:$2|change|changes}}].',
 104+
 105+There {{PLURAL:$2|is|are}} currently [{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} $2 pending {{PLURAL:$2|change|changes}}]. The content shown below is a \'\'preview\'\' of {{PLURAL:$2|that change|those changes}}.',
106106 'revreview-edited-section' => 'Return to page section named "[[#$1|$2]]".',
107107 'revreview-flag' => 'Review this revision',
108108 'revreview-reflag' => 'Re-review this revision',
@@ -111,51 +111,43 @@
112112 'revreview-main' => 'You must select a particular revision of a content page in order to review.
113113
114114 See the [[Special:Unreviewedpages|list of unreviewed pages]].',
115 - 'revreview-newest-basic' => 'The [{{fullurl:{{FULLPAGENAMEE}}|stable=1}} published version] was [{{fullurl:{{#Special:Log}}|type=review&page={{FULLPAGENAMEE}}}} checked] on <i>$2</i>. The draft contains
116 -[{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} $3 pending {{PLURAL:$3|change|changes}}].',
117 - 'revreview-newest-basic-i' => 'The [{{fullurl:{{FULLPAGENAMEE}}|stable=1}} published version] was [{{fullurl:{{#Special:Log}}|type=review&page={{FULLPAGENAMEE}}}} checked] on <i>$2</i>. The draft contains
118 -[{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} template/file changes] await review.',
119 - 'revreview-newest-quality' => 'The [{{fullurl:{{FULLPAGENAMEE}}|stable=1}} published version] was [{{fullurl:{{#Special:Log}}|type=review&page={{FULLPAGENAMEE}}}} approved] on <i>$2</i>. The draft contains
120 -[{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} $3 pending {{PLURAL:$3|change|changes}}].',
121 - 'revreview-newest-quality-i' => 'The [{{fullurl:{{FULLPAGENAMEE}}|stable=1}} published version] was [{{fullurl:{{#Special:Log}}|type=review&page={{FULLPAGENAMEE}}}} approved] on <i>$2</i>. The draft contains
122 -[{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} template/file changes] await review.',
123 - 'revreview-pending-basic' => 'The [{{fullurl:{{FULLPAGENAMEE}}|stable=1}} published version] was [{{fullurl:{{#Special:Log}}|type=review&page={{FULLPAGENAMEE}}}} checked] on <i>$2</i>. The [{{fullurl:{{FULLPAGENAMEE}}|stable=0}} draft] contains
124 -[{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} $3 pending {{PLURAL:$3|change|changes}}].',
125 - 'revreview-pending-quality' => 'The [{{fullurl:{{FULLPAGENAMEE}}|stable=1}} published version] was [{{fullurl:{{#Special:Log}}|type=review&page={{FULLPAGENAMEE}}}} approved] on <i>$2</i>. The [{{fullurl:{{FULLPAGENAMEE}}|stable=0}} draft] contains
126 -[{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} $3 pending {{PLURAL:$3|change|changes}}].',
127 - 'revreview-pending-nosection' => 'Try viewing the [{{fullurl:{{FULLPAGENAMEE}}|stable=0}} draft], which includes
 115+ 'revreview-newest-basic' => 'The [{{fullurl:{{FULLPAGENAMEE}}|stable=1}} published version] was [{{fullurl:{{#Special:Log}}|type=review&page={{FULLPAGENAMEE}}}} checked] on <i>$2</i>. There {{PLURAL:$3|is|are}} [{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} $3 pending {{PLURAL:$3|change|changes}}] awaiting review.',
 116+ 'revreview-newest-basic-i' => 'The [{{fullurl:{{FULLPAGENAMEE}}|stable=1}} published version] was [{{fullurl:{{#Special:Log}}|type=review&page={{FULLPAGENAMEE}}}} checked] on <i>$2</i>. There are [{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} template/file changes] awaiting review.',
 117+ 'revreview-newest-quality' => 'The [{{fullurl:{{FULLPAGENAMEE}}|stable=1}} published version] was [{{fullurl:{{#Special:Log}}|type=review&page={{FULLPAGENAMEE}}}} approved] on <i>$2</i>. There {{PLURAL:$3|is|are}} [{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} $3 pending {{PLURAL:$3|change|changes}}] awaiting review.',
 118+ 'revreview-newest-quality-i' => 'The [{{fullurl:{{FULLPAGENAMEE}}|stable=1}} published version] was [{{fullurl:{{#Special:Log}}|type=review&page={{FULLPAGENAMEE}}}} approved] on <i>$2</i>. There are [{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} template/file changes] awaiting review.',
 119+ 'revreview-pending-basic' => 'The [{{fullurl:{{FULLPAGENAMEE}}|stable=1}} published version] was [{{fullurl:{{#Special:Log}}|type=review&page={{FULLPAGENAMEE}}}} checked] on <i>$2</i>. There {{PLURAL:$3|is|are}} [{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} $3 pending {{PLURAL:$3|change|changes}}] awaiting review.',
 120+ 'revreview-pending-quality' => 'The [{{fullurl:{{FULLPAGENAMEE}}|stable=1}} published version] was [{{fullurl:{{#Special:Log}}|type=review&page={{FULLPAGENAMEE}}}} approved] on <i>$2</i>. There {{PLURAL:$3|is|are}} [{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} $3 pending {{PLURAL:$3|change|changes}}] awaiting review.',
 121+ 'revreview-pending-nosection' => 'Try viewing the [{{fullurl:{{FULLPAGENAMEE}}|stable=0}} latest revision], which includes
128122 [{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} $2 pending {{PLURAL:$2|change|changes}}], to see if the section was moved or deleted.',
129123 'revreview-noflagged' => 'There are no [[{{MediaWiki:Validationpage}}|reviewed]] revisions of this page, so it may \'\'\'not\'\'\' have been [[{{MediaWiki:Validationpage}}|checked]] for quality.',
130124 'revreview-note' => '[[User:$1|$1]] made the following notes [[{{MediaWiki:Validationpage}}|reviewing]] this revision:',
131125 'revreview-notes' => 'Observations or notes to display:',
132126 'revreview-oldrating' => 'It was rated:',
133127 'revreview-quality' => 'This is the [[{{MediaWiki:Validationpage}}|published version]], [{{fullurl:{{#Special:Log}}|type=review&page={{FULLPAGENAMEE}}}} approved] on <i>$2</i>.
134 -The [{{fullurl:{{FULLPAGENAMEE}}|stable=0}} draft] contains [{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} $3 pending {{PLURAL:$3|change|changes}}] awaiting review.',
 128+There {{PLURAL:$3|is|are}} [{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} $3 pending {{PLURAL:$3|change|changes}}] awaiting review.',
135129 'revreview-quality-i' => 'This is the [[{{MediaWiki:Validationpage}}|published version]], [{{fullurl:{{#Special:Log}}|type=review&page={{FULLPAGENAMEE}}}} approved] on <i>$2</i>.
136 -The [{{fullurl:{{FULLPAGENAMEE}}|stable=0}} draft] has [{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} template/file changes] awaiting review.',
137 - 'revreview-quality-old' => 'This is a [[{{MediaWiki:Validationpage}}|quality]] revision ([{{fullurl:{{#Special:ReviewedVersions}}|page={{FULLPAGENAMEE}}}} list all]), [{{fullurl:{{#Special:Log}}|type=review&page={{FULLPAGENAMEE}}}} approved] on <i>$2</i>.
 130+There are [{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} template/file changes] awaiting review.',
 131+ 'revreview-quality-old' => 'This is a [[{{MediaWiki:Validationpage}}|quality]] version ([{{fullurl:{{#Special:ReviewedVersions}}|page={{FULLPAGENAMEE}}}} list all]), [{{fullurl:{{#Special:Log}}|type=review&page={{FULLPAGENAMEE}}}} approved] on <i>$2</i>.
138132 New [{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} changes] may have been made.',
139133 'revreview-quality-same' => 'This is the [[{{MediaWiki:Validationpage}}|published version]], [{{fullurl:{{#Special:Log}}|type=review&page={{FULLPAGENAMEE}}}} approved] on <i>$2</i>.',
140134 'revreview-quality-source' => 'A [{{fullurl:{{FULLPAGENAMEE}}|stableid=$1}} quality version] of this page, [{{fullurl:{{#Special:Log}}|type=review&page={{FULLPAGENAMEE}}}} approved] on <i>$2</i>, was based off this revision.',
141135 'revreview-quality-title' => 'This is a quality version of this page',
142 - 'revreview-quick-basic' => '\'\'\'[[{{MediaWiki:Validationpage}}|Checked page]]\'\'\' [[{{fullurl:{{FULLPAGENAMEE}}|stable=0}} view draft]]',
143 - 'revreview-quick-basic-old' => '\'\'\'[[{{MediaWiki:Validationpage}}|Checked page]]\'\'\' [[{{fullurl:{{FULLPAGENAMEE}}|stable=0}} view draft]]',
 136+ 'revreview-quick-basic' => '\'\'\'[[{{MediaWiki:Validationpage}}|Checked page]]\'\'\' ([{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} review pending changes])',
 137+ 'revreview-quick-basic-old' => '\'\'\'[[{{MediaWiki:Validationpage}}|Checked version]]\'\'\'',
144138 'revreview-quick-basic-same' => '\'\'\'[[{{MediaWiki:Validationpage}}|Checked page]]\'\'\'',
145139 'revreview-quick-invalid' => '\'\'\'Invalid revision ID\'\'\'',
146 - 'revreview-quick-none' => '\'\'\'[[{{MediaWiki:Validationpage}}|Draft page]]\'\'\' (unreviewed)',
147 - 'revreview-quick-quality' => '\'\'\'[[{{MediaWiki:Validationpage}}|Quality page]]\'\'\' [[{{fullurl:{{FULLPAGENAMEE}}|stable=0}} view draft]]',
148 - 'revreview-quick-quality-old' => '\'\'\'[[{{MediaWiki:Validationpage}}|Quality page]]\'\'\' [[{{fullurl:{{FULLPAGENAMEE}}|stable=0}} view draft]]',
 140+ 'revreview-quick-none' => '\'\'\'[[{{MediaWiki:Validationpage}}|Unreviewed page]]\'\'\'',
 141+ 'revreview-quick-quality' => '\'\'\'[[{{MediaWiki:Validationpage}}|Quality page]]\'\'\' ([{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} review pending changes])',
 142+ 'revreview-quick-quality-old' => '\'\'\'[[{{MediaWiki:Validationpage}}|Quality version]]\'\'\'',
149143 'revreview-quick-quality-same' => '\'\'\'[[{{MediaWiki:Validationpage}}|Quality page]]\'\'\'',
150 - 'revreview-quick-see-basic' => '\'\'\'[[{{MediaWiki:Validationpage}}|Draft]]\'\'\' [[{{fullurl:{{FULLPAGENAMEE}}|stable=1}} published version]]
151 -([{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} compare])',
152 - 'revreview-quick-see-quality' => '\'\'\'[[{{MediaWiki:Validationpage}}|Draft]]\'\'\' [[{{fullurl:{{FULLPAGENAMEE}}|stable=1}} published version]]
153 -([{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} compare])',
 144+ 'revreview-quick-see-basic' => '([{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} review pending changes])',
 145+ 'revreview-quick-see-quality' => '([{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} review pending changes])',
154146 'revreview-selected' => 'Selected revision of \'\'\'$1:\'\'\'',
155 - 'revreview-source' => 'Draft source',
 147+ 'revreview-source' => 'View source',
156148 'revreview-stable' => 'Published page',
157149 'revreview-basic-title' => 'This is a checked version of this page',
158150 '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}} published version] of this page.',
159 - 'revreview-stable2' => 'You may want to view the [{{fullurl:$1|stable=1}} published version] of this page (if there still is one).',
 151+ 'revreview-stable2' => 'You may want to view the [{{fullurl:$1|stable=1}} published version] of this page.',
160152 'revreview-style' => 'Readability',
161153 'revreview-style-0' => 'Unapproved',
162154 'revreview-style-1' => 'Acceptable',
@@ -182,11 +174,11 @@
183175 \'\'\'Some templates/files were updated:\'\'\'',
184176 'revreview-update-includes' => '\'\'\'Some templates/files were updated:\'\'\'',
185177 'revreview-update-none' => 'Please [[{{MediaWiki:Validationpage}}|review]] any changes \'\'(shown below)\'\' made since the published version was [{{fullurl:{{#Special:Log}}|type=review&page={{FULLPAGENAMEE}}}} approved].',
186 - 'revreview-update-use' => '\'\'\'NOTE:\'\'\' If any of these templates/files have a published version, then it is already used in the published version of this page.',
 178+ 'revreview-update-use' => '\'\'\'NOTE:\'\'\' The published version of each of these templates/files is used in the published version of this page.',
187179 'revreview-visibility' => '\'\'\'This page has an updated [[{{MediaWiki:Validationpage}}|published version]]; page stability settings can be [{{fullurl:{{#Special:Stabilization}}|page={{FULLPAGENAMEE}}}} configured].\'\'\'',
188180 'revreview-visibility2' => '\'\'\'This page has an outdated [[{{MediaWiki:Validationpage}}|published version]]; page stability settings can be [{{fullurl:{{#Special:Stabilization}}|page={{FULLPAGENAMEE}}}} configured].\'\'\'',
189181 'revreview-visibility3' => '\'\'\'This page does not have a [[{{MediaWiki:Validationpage}}|published version]]; page stability settings can be [{{fullurl:{{#Special:Stabilization}}|page={{FULLPAGENAMEE}}}} configured].\'\'\'',
190 - 'revreview-revnotfound' => 'The old revision of the page you asked for could not be found.
 182+ 'revreview-revnotfound' => 'The old version of the page you asked for could not be found.
191183 Please check the URL you used to access this page.',
192184 'right-autoreview' => 'Have one\'s own edits automatically marked as "checked"',
193185 'right-movestable' => 'Move published pages',
@@ -221,7 +213,7 @@
222214
223215 'revreview-reviewlink' => 'review',
224216
225 - 'tooltip-ca-current' => 'View the current draft of this page',
 217+ 'tooltip-ca-current' => 'View this page with pending changes',
226218 'tooltip-ca-stable' => 'View the published version of this page',
227219 'tooltip-ca-default' => 'Quality assurance settings',
228220
Index: trunk/extensions/FlaggedRevs/FlaggedArticleView.php
@@ -456,7 +456,7 @@
457457 $msg = $quality
458458 ? 'revreview-quick-quality-old'
459459 : 'revreview-quick-basic-old';
460 - $msgHTML = wfMsgExt( $msg, array( 'parseinline' ), $frev->getRevId(), $time );
 460+ $msgHTML = wfMsgExt( $msg, array( 'parseinline' ), $frev->getRevId(), $revsSince );
461461 }
462462 $msgHTML = $prot . $icon . $msgHTML;
463463 $tag = FlaggedRevsXML::prettyRatingBox( $frev, $msgHTML,

Follow-up revisions

RevisionCommit summaryAuthorDate
r63939MFT r63938aaron23:34, 18 March 2010

Status & tagging log