| Index: trunk/extensions/DeleteQueue/DeleteQueue.i18n.php |
| — | — | @@ -18,15 +18,15 @@ |
| 19 | 19 | 'deletequeue-action' => 'Suggest deletion', |
| 20 | 20 | 'deletequeue-action-title' => "Suggest deletion of \"$1\"", |
| 21 | 21 | 'deletequeue-action-text' => "{{SITENAME}} has a number of processes for deleting pages: |
| 22 | | -*If you believe that this page warrants ''speedy deletion'', you may suggest that [{{fullurl:{{PAGENAME}}|action=delnom|queue=speedy}} here]. |
| 23 | | -*If this page does not warrant speedy deletion, but ''deletion will likely be uncontroversial'', you should [{{fullurl:{{PAGENAME}}|action=delnom|queue=prod}} propose uncontested deletion]. |
| 24 | | -*If this page's deletion is ''likely to be contested'', you should [{{fullurl:{{PAGENAME}}|action=delnom|queue=deletediscuss}} open a discussion].", |
| | 22 | +*If you believe that this page warrants ''speedy deletion'', you may suggest that [{{fullurl:{{PAGENAME}}|action=delnom&queue=speedy}} here]. |
| | 23 | +*If this page does not warrant speedy deletion, but ''deletion will likely be uncontroversial'', you should [{{fullurl:{{PAGENAME}}|action=delnom&queue=prod}} propose uncontested deletion]. |
| | 24 | +*If this page's deletion is ''likely to be contested'', you should [{{fullurl:{{PAGENAME}}|action=delnom&queue=deletediscuss}} open a discussion].", |
| 25 | 25 | |
| 26 | 26 | // Permissions errors |
| 27 | | - 'deletequeue-permissions-noedit' => "You must be able to edit a page to be able to affect its deletion status. $1", |
| | 27 | + 'deletequeue-permissions-noedit' => "You must be able to edit a page to be able to affect its deletion status.", |
| 28 | 28 | |
| 29 | 29 | // Nomination forms |
| 30 | | - 'deletequeue-generic-reasons' => "* Blah\n** Blah blah!\n** Blah blah blah!\n*Moo\n** Mooey pooey!\n** Pooey mooey!", |
| | 30 | + 'deletequeue-generic-reasons' => "* Generic reasons\n ** Vandalism\n ** Spam\n ** Maintenance\n ** Out of project scope", |
| 31 | 31 | |
| 32 | 32 | // Speedy deletion |
| 33 | 33 | 'deletequeue-speedy-title' => 'Mark "$1" for speedy deletion', |
| — | — | @@ -89,9 +89,8 @@ |
| 90 | 90 | 'deletequeue-review-newextra' => 'Extra information:', |
| 91 | 91 | 'deletequeue-review-submit' => 'Save Review', |
| 92 | 92 | 'deletequeue-review-original' => "Reason for nomination", |
| 93 | | - 'deletequeue-actiondisabled-involved' => 'You have taken part in this deletion case in the following roles: $1', |
| 94 | | - 'deletequeue-actiondisabled-notexpired' => 'the deletion nomination has not yet expired', |
| 95 | | - 'deletequeue-actiondisabled' => 'The following action is disabled because $1:', |
| | 93 | + 'deletequeue-actiondisabled-involved' => 'The following action is disabled because you have taken part in this deletion case in the roles $1:', |
| | 94 | + 'deletequeue-actiondisabled-notexpired' => 'The following action is disabled because the deletion nomination has not yet expired:', |
| 96 | 95 | 'deletequeue-review-badaction' => 'You specified an invalid action', |
| 97 | 96 | 'deletequeue-review-actiondenied' => 'You specified an action which is disabled for this page', |
| 98 | 97 | "deletequeue-review-objections" => "'''Warning''': The deletion of this page has [{{FULLURL:{{PAGENAME}}|action=delvoteview|votetype=object}} objections]. |
| Index: trunk/extensions/DeleteQueue/ReviewForm.php |
| — | — | @@ -232,7 +232,7 @@ |
| 233 | 233 | list ($enabled,$disabled) = $this->availableActions(); |
| 234 | 234 | |
| 235 | 235 | if (!$disabledMsg) { |
| 236 | | - $disabledMsg = wfMsgExt("deletequeue-review-$action", array('parseinline')); |
| | 236 | + $disabledMsg = wfMsgExt("deletequeue-review-$action", array('parse')); |
| 237 | 237 | } |
| 238 | 238 | |
| 239 | 239 | $data = ''; |
| — | — | @@ -240,7 +240,7 @@ |
| 241 | 241 | if (in_array($action,$enabled)) { |
| 242 | 242 | $data = $enabledText; |
| 243 | 243 | } elseif ( in_array( $action, array_keys( $disabled ) ) ) { |
| 244 | | - $msg = wfMsgExt( 'deletequeue-actiondisabled', array( 'parse' ), array( $disabled[$action] ) ); |
| | 244 | + $msg = $disabled[$action]; |
| 245 | 245 | $msg .= "\n"; |
| 246 | 246 | $msg .= $disabledMsg; |
| 247 | 247 | $data = $msg; |
| Index: trunk/extensions/DeleteQueue/DeleteQueueInterface.php |
| — | — | @@ -19,11 +19,15 @@ |
| 20 | 20 | if (count(array_merge($editErrors,$nomErrors))) { |
| 21 | 21 | // Permissions errors. |
| 22 | 22 | if (count($editErrors)) { |
| | 23 | + // This is a really bad way to do this. |
| 23 | 24 | $editError = $wgOut->formatPermissionsErrorMessage( $editErrors, 'edit' ); |
| 24 | 25 | $nomErrors[] = array( 'deletequeue-permissions-noedit', $editError ); |
| 25 | 26 | } |
| 26 | 27 | |
| 27 | 28 | $wgOut->showPermissionsErrorPage( $nomErrors, "{$queue}-nominate" ); |
| | 29 | + if (isset($editError)) { |
| | 30 | + $wgOut->addHTML( $editError ); |
| | 31 | + } |
| 28 | 32 | return; |
| 29 | 33 | } |
| 30 | 34 | |