Commafy support for convertNumber

[lhc/web/wiklou.git] / includes / resourceloader / ResourceLoaderLanguageDataModule.php

diff --git a/includes/resourceloader/ResourceLoaderLanguageDataModule.php b/includes/resourceloader/ResourceLoaderLanguageDataModule.php
index 9679a59..0f8e54c 100644 (file)
--- a/includes/resourceloader/ResourceLoaderLanguageDataModule.php
+++ b/includes/resourceloader/ResourceLoaderLanguageDataModule.php
@@ -47,24 +47,35 @@ class ResourceLoaderLanguageDataModule extends ResourceLoaderModule {
                return $this->language->getPluralRules();
        }
 
+       /**
+        * Get the digit groupin Pattern for the site content language.
+        *
+        * @return array
+        */
+       protected function getDigitGroupingPattern() {
+               return $this->language->digitGroupingPattern();
+       }
+
        /**
         * Get the digit transform table for the content language
-        * Seperator transform table also required here to convert
-        * the . and , sign to appropriate forms in content language.
         *
         * @return array
         */
        protected function getDigitTransformTable() {
-               $digitTransformTable = $this->language->digitTransformTable();
-               $separatorTransformTable = $this->language->separatorTransformTable();
-               if ( $digitTransformTable ) {
-                       array_merge( $digitTransformTable, (array)$separatorTransformTable );
-               } else {
-                       return $separatorTransformTable;
-               }
-               return $digitTransformTable;
+               return $this->language->digitTransformTable();
        }
 
+       /**
+        * Get seperator transform table required for converting
+        * the . and , sign to appropriate forms in site content language.
+        *
+        * @return array
+        */
+       protected function getSeparatorTransformTable() {
+               return $this->language->separatorTransformTable();
+       }
+
+
        /**
         * Get all the dynamic data for the content language to an array
         *
@@ -73,8 +84,10 @@ class ResourceLoaderLanguageDataModule extends ResourceLoaderModule {
        protected function getData() {
                return array(
                        'digitTransformTable' => $this->getDigitTransformTable(),
+                       'separatorTransformTable' => $this->getSeparatorTransformTable(),
                        'grammarForms' => $this->getSiteLangGrammarForms(),
                        'pluralRules' => $this->getPluralRules(),
+                       'digitGroupingPattern' => $this->getDigitGroupingPattern(),
                );
        }