* (bug 21116) MediaWiki:Templatesused, MediaWiki:Templatesusedpreview and MediaWiki...

* break lines a 80 chars in RELEASE-NOTES

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index ce8fd46..8fb55cf 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -543,8 +543,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 3421) Live preview no longer breaks user CSS/JS previews
 * (bug 11264) The file logo on a file description page for documents (PDF, ...)
   now links to the file rather than the file description page
-* Password fields built with HTMLForm now still have the type="password" attribute
-  if $wgHtml5=false.
+* Password fields built with HTMLForm now still have the type="password"
+  attribute if $wgHtml5=false.
 * (bug 20836) Preload now works for MediaWiki namespace
 * (bug 20885) Search box no longer suggests unavailable special pages
 * (bug 20948) "Create this page" on Special:Search is no longer displayed when
@@ -552,12 +552,15 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 20524) Hideuser: Show nice error when trying to block hidden user without 
   hideuser right
 * (bug 21026) Fixed file redirects on shared repos on non-English client wikis
-* (bug 21030) Fixed schema choices from being overwritten by defining unique field names per driver.
+* (bug 21030) Fixed schema choices from being overwritten by defining unique
+  field names per driver.
 * (bug 21115) wgCanonicalSpecialPageName javascript variable is now always
   false on non-special pages
 * (bug 21113) "Other statistics" header on Special:Statistics is no more
   displayed when there isn't any entry in it
 * (bug 21114) Special:Contributions no longer shows diff links for new revisions
+* (bug 21116) MediaWiki:Templatesused, MediaWiki:Templatesusedpreview and
+  MediaWiki:Templatesusedsection now support plural
 
 == API changes in 1.16 ==
 

diff --git a/includes/Linker.php b/includes/Linker.php
index f598769..311e0ed 100644 (file)
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -1453,11 +1453,11 @@ class Linker {
                        # Construct the HTML
                        $outText = '<div class="mw-templatesUsedExplanation">';
                        if ( $preview ) {
-                               $outText .= wfMsgExt( 'templatesusedpreview', array( 'parse' ) );
+                               $outText .= wfMsgExt( 'templatesusedpreview', array( 'parse' ), count( $templates ) );
                        } elseif ( $section ) {
-                               $outText .= wfMsgExt( 'templatesusedsection', array( 'parse' ) );
+                               $outText .= wfMsgExt( 'templatesusedsection', array( 'parse' ), count( $templates ) );
                        } else {
-                               $outText .= wfMsgExt( 'templatesused', array( 'parse' ) );
+                               $outText .= wfMsgExt( 'templatesused', array( 'parse' ), count( $templates ) );
                        }
                        $outText .= "</div><ul>\n";
 

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 5743431..77220a2 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1327,9 +1327,9 @@ The administrator who locked it offered this explanation: $1",
 'semiprotectedpagewarning'         => "'''Note:''' This page has been locked so that only registered users can edit it.",
 'cascadeprotectedwarning'          => "'''Warning:''' This page has been locked so that only users with administrator privileges can edit it, because it is included in the following cascade-protected {{PLURAL:$1|page|pages}}:",
 'titleprotectedwarning'            => "'''Warning: This page has been locked so that [[Special:ListGroupRights|specific rights]] are needed to create it.'''",
-'templatesused'                    => 'Templates used on this page:',
-'templatesusedpreview'             => 'Templates used in this preview:',
-'templatesusedsection'             => 'Templates used in this section:',
+'templatesused'                    => '{{PLURAL:$1|Template|Templates}} used on this page:',
+'templatesusedpreview'             => '{{PLURAL:$1|Template|Templates}} used in this preview:',
+'templatesusedsection'             => '{{PLURAL:$1|Template|Templates}} used in this section:',
 'template-protected'               => '(protected)',
 'template-semiprotected'           => '(semi-protected)',
 'hiddencategories'                 => 'This page is a member of {{PLURAL:$1|1 hidden category|$1 hidden categories}}:',