* (bug 11727) Support plural in 'historysize' message

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 5489130..1a27246 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -112,6 +112,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Fix regression in LinkBatch.php breaking PHP 5.0
 * (bug 11452) wfMsgExt uses sometimes wrong language object for parsing magic
   words when called with options ''parsemag'' or ''content''. 
+* (bug 11727) Support plural in 'historysize' message
 
 === API changes in 1.12 ===
 

diff --git a/includes/PageHistory.php b/includes/PageHistory.php
index df711c8..6842107 100644 (file)
--- a/includes/PageHistory.php
+++ b/includes/PageHistory.php
@@ -222,11 +222,11 @@ class PageHistory {
                        $s .= ' ' . wfElement( 'span', array( 'class' => 'minor' ), wfMsg( 'minoreditletter') );
                }
 
-               if (!is_null($size = $rev->getSize())) {
-                       if ($size == 0)
-                               $stxt = wfMsgHtml('historyempty');
+               if ( !is_null( $size = $rev->getSize() ) ) {
+                       if ( $size == 0 )
+                               $stxt = wfMsgHtml( 'historyempty' );
                        else
-                               $stxt = wfMsgHtml('historysize', $wgLang->formatNum( $size ) );
+                               $stxt = wfMsgExt( 'historysize', array( 'parsemag' ), $wgLang->formatNum( $size ) );
                        $s .= " <span class=\"history-size\">$stxt</span>";
                }
 

diff --git a/languages/messages/MessagesDe.php b/languages/messages/MessagesDe.php
index 2d665f9..28bb28c 100644 (file)
--- a/languages/messages/MessagesDe.php
+++ b/languages/messages/MessagesDe.php
@@ -787,7 +787,7 @@ Grund der Sperre: ''$2''",
 'deletedrev'          => '[gelöscht]',
 'histfirst'           => 'Älteste',
 'histlast'            => 'Neueste',
-'historysize'         => '($1 Bytes)',
+'historysize'         => '({{PLURAL:$1|1 Byte|$1 Bytes}})',
 'historyempty'        => '(leer)',
 
 # Revision feed

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 131f0b8..ca6b719 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1116,7 +1116,7 @@ Legend: (cur) = difference with current version,
 'deletedrev'            => '[deleted]',
 'histfirst'             => 'Earliest',
 'histlast'              => 'Latest',
-'historysize'           => '($1 bytes)',
+'historysize'           => '({{PLURAL:$1|1 byte|$1 bytes}})',
 'historyempty'          => '(empty)',
 
 # Revision feed