Ticket #3677: 3677.diff

wp-includes/functions.php

@@ -86 +86 @@
 function number_format_i18n($number, $decimals = null) {
         global $wp_locale;
         // let the user override the precision only
-        $decimals = is_null($decimals)? $wp_locale->number_format['decimals'] : intval($decimals);
+        $decimals = is_null($decimals)? $wp_locale->number_format_decimals : intval($decimals);
 
-        return number_format($number, $decimals, $wp_locale->number_format['decimal_point'], $wp_locale->number_format['thousands_sep']);
+        return number_format($number, $decimals, $wp_locale->number_format_decimal_point, $wp_locale->number_format_thousands_sep);
 }
 
 function get_weekstartend($mysqlstring, $start_of_week) {

wp-includes/locale.php

@@ -12 +12 @@
 
         var $meridiem;
 
+        // Locale vars, can be changed in $locale.php.
         var $text_direction = 'ltr';
-        var $locale_vars = array('text_direction');
+        // Numbers formatting. See http://www.php.net/number_format
+        var $number_format_decimals = 0;
+        var $number_format_decimal_point = '.';
+        var $number_format_thousands_sep = ',';
+        var $locale_vars = array('text_direction', 'number_format_decimals', 'number_format_decimal_point',
+                'number_format_thousands_sep');
 
         function init() {
                 // The Weekdays
@@ -87 +93 @@
                 $this->meridiem['AM'] = __('AM');
                 $this->meridiem['PM'] = __('PM');
 
-                // Numbers formatting
-                // See http://php.net/number_format
-
-                $trans = __('number_format_decimals'); 
-                $this->number_format['decimals'] = ('number_format_decimals' == $trans) ? 0 : $trans;
-                
-                $trans = __('number_format_decimal_point');
-                $this->number_format['decimal_point'] = ('number_format_decimal_point' == $trans) ? '.' : $trans;
-
-                $trans = __('number_format_thousands_sep');     
-                $this->number_format['thousands_sep'] = ('number_format_thousands_sep' == $trans) ? ',' : $trans; 
-                
                 // Import global locale vars set during inclusion of $locale.php.
                 foreach ( $this->locale_vars as $var ) {
                         if ( isset($GLOBALS[$var]) )
                                 $this->$var = $GLOBALS[$var];
                 }
-
         }
 
         function get_weekday($weekday_number) {