* {{PLURAL:}} now handles formatted numbers correctly

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 2ece536..da8b598 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -397,6 +397,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   option to prevent this when running maintennace/update.php
 * (bug 7612) Remove superfluous link to Special:Categories from result items
   on Special:Mostcategories
+* {{PLURAL:}} now handles formatted numbers correctly
 
 == Languages updated ==
 

diff --git a/includes/CoreParserFunctions.php b/includes/CoreParserFunctions.php
index 80280cf..7974893 100644 (file)
--- a/includes/CoreParserFunctions.php
+++ b/includes/CoreParserFunctions.php
@@ -93,6 +93,7 @@ class CoreParserFunctions {
        }
 
        static function plural( $parser, $text = '', $arg0 = null, $arg1 = null, $arg2 = null, $arg3 = null, $arg4 = null ) {
+               $text = $parser->getFunctionLang()->parseFormattedNumber( $text );
                return $parser->getFunctionLang()->convertPlural( $text, $arg0, $arg1, $arg2, $arg3, $arg4 );
        }
 

diff --git a/languages/Language.php b/languages/Language.php
index 2cd49cd..e0ad7e6 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -1166,6 +1166,17 @@ class Language {
                return $number;
        }
 
+       function parseFormattedNumber( $number ) {
+               $s = $this->digitTransformTable();
+               if (!is_null($s)) { $number = strtr($number, array_flip($s)); }
+
+               $s = $this->separatorTransformTable();
+               if (!is_null($s)) { $number = strtr($number, array_flip($s)); }
+
+               $number = strtr( $number, array (',' => '') );
+               return $number;
+       }
+
        /**
         * Adds commas to a given number
         *