From: Siebrand Mazeland <siebrand@users.mediawiki.org>
Date: Thu, 21 May 2009 17:52:43 +0000 (+0000)
Subject: (bug 13456) categoriespagetext supports PLURAL
X-Git-Tag: 1.31.0-rc.0~41712
X-Git-Url: https://git.cyclocoop.org//%22?a=commitdiff_plain;h=2ebfaf5320b747aa393a06ddea96b36b70b5e059;p=lhc%2Fweb%2Fwiklou.git

(bug 13456) categoriespagetext supports PLURAL
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 73b4db341e..5346aca929 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -65,6 +65,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 18849) Implement Japanese and North Korean calendars
 * (bug 5755) Introduce {{CURRENTMONTH1}} and {{LOCALMONTH1}} to display the
   month number without the leading zero
+* (bug 13456) categoriespagetext supports PLURAL
 
 === Bug fixes in 1.16 ===
 
diff --git a/includes/specials/SpecialCategories.php b/includes/specials/SpecialCategories.php
index fca0538802..d2d03eba43 100644
--- a/includes/specials/SpecialCategories.php
+++ b/includes/specials/SpecialCategories.php
@@ -16,7 +16,7 @@ function wfSpecialCategories( $par=null ) {
 	$cap->doQuery();
 	$wgOut->addHTML(
 		XML::openElement( 'div', array('class' => 'mw-spcontent') ) .
-		wfMsgExt( 'categoriespagetext', array( 'parse' ) ) .
+		wfMsgExt( 'categoriespagetext', array( 'parse' ), $cap->getNumRows() ) .
 		$cap->getStartForm( $from ) .
 		$cap->getNavigationBar() .
 		'<ul>' . $cap->getBody() . '</ul>' .
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 7bb7757567..a3adbead4d 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2241,7 +2241,7 @@ It may contain one or more characters which cannot be used in titles.',
 # Special:Categories
 'categories'                    => 'Categories',
 'categories-summary'            => '', # do not translate or duplicate this message to other languages
-'categoriespagetext'            => 'The following categories contain pages or media.
+'categoriespagetext'            => 'The following {{PLURAL:$1|category contains|categories contain}} pages or media.
 [[Special:UnusedCategories|Unused categories]] are not shown here.
 Also see [[Special:WantedCategories|wanted categories]].',
 'categoriesfrom'                => 'Display categories starting at:',