* Plural for delete-toobig and delete-warning-toobig

diff --git a/includes/specials/SpecialMovepage.php b/includes/specials/SpecialMovepage.php
index d08fb66..caba8c4 100644 (file)
--- a/includes/specials/SpecialMovepage.php
+++ b/includes/specials/SpecialMovepage.php
@@ -139,15 +139,12 @@ class MovePageForm {
 
                if ( $err != '' ) {
                        $wgOut->setSubtitle( wfMsg( 'formerror' ) );
-                       $errMsg = "";
                        if( $err == 'hookaborted' ) {
                                $errMsg = "<p><strong class=\"error\">$hookErr</strong></p>\n";
-                       } else if (is_array($err)) {
-                               $errMsg = '<p><strong class="error">' . call_user_func_array( 'wfMsgWikiHtml', $err ) . "</strong></p>\n";
+                               $wgOut->addHTML( $errMsg );
                        } else {
-                               $errMsg = '<p><strong class="error">' . wfMsgWikiHtml( $err ) . "</strong></p>\n";
+                               $wgOut->wrapWikiMsg( '<p><strong class="error">$1</strong></p>', $err );
                        }
-                       $wgOut->addHTML( $errMsg );
                }
 
                $wgOut->addHTML(

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index c1e7c89..673e7bd 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2146,9 +2146,9 @@ See $2 for a record of recent deletions.',
 ** Copyright violation
 ** Vandalism',
 'delete-edit-reasonlist'      => 'Edit delete reasons',
-'delete-toobig'               => 'This page has a large edit history, over $1 revisions.
+'delete-toobig'               => 'This page has a large edit history, over $1 {{PLURAL:$1|revision|revisions}}.
 Deletion of such pages has been restricted to prevent accidental disruption of {{SITENAME}}.',
-'delete-warning-toobig'       => 'This page has a large edit history, over $1 revisions.
+'delete-warning-toobig'       => 'This page has a large edit history, over $1 {{PLURAL:$1|revision|revisions}}.
 Deleting it may disrupt database operations of {{SITENAME}};
 proceed with caution.',
 'rollback'                    => 'Roll back edits',