From: Niklas Laxström <nikerabbit@users.mediawiki.org>
Date: Mon, 7 Jul 2008 11:00:19 +0000 (+0000)
Subject: * Plural for delete-toobig and delete-warning-toobig
X-Git-Tag: 1.31.0-rc.0~46664
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=0950e4c3e84207264714c14aab1dc9dd6bfffc6a;p=lhc%2Fweb%2Fwiklou.git

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

diff --git a/includes/specials/SpecialMovepage.php b/includes/specials/SpecialMovepage.php
index d08fb66bd8..caba8c4df0 100644
--- 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 c1e7c89612..673e7bd3ad 100644
--- 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',