Changeset 14190

Timestamp:

04/22/10 21:39:37 (6 years ago)

Author:

westi

Message:

Restore support for floating point numbers in number_format_i18n(). Fixes #10555.

Location:

trunk

Files:

• wp-admin/admin-header.php (modified) (1 diff)
• wp-includes/functions.php (modified) (3 diffs)
• wp-includes/load.php (modified) (1 diff)
• wp-includes/locale.php (modified) (1 diff)

trunk/wp-admin/admin-header.php

@@ -44 +44 @@
     typenow = '<?php if ( isset($current_screen->post_type) ) echo $current_screen->post_type; ?>',
     adminpage = '<?php echo $admin_body_class; ?>',
-    thousandsSeparator = '<?php echo addslashes( $wp_locale->number_format['thousands_sep'] ); ?>';
+    thousandsSeparator = '<?php echo addslashes( $wp_locale->number_format['thousands_sep'] ); ?>',
+    decimalPoint = '<?php echo addslashes( $wp_locale->number_format['decimal_point'] ); ?>';
 //]]>
 </script>

trunk/wp-includes/functions.php

@@ -132 +132 @@
  *
  * @param int $number The number to convert based on locale.
- * @param int $decimals Precision of the number of decimal places. Deprectated.
+ * @param int $decimals Precision of the number of decimal places.
  * @return string Converted number in string format.
  */
-function number_format_i18n( $number, $decimals = null ) {
+function number_format_i18n( $number, $decimals = 0 ) {
     global $wp_locale;
     $number = (int)$number;
-    if ( !is_null( $decimals ) ) _deprecated_argument( __FUNCTION__, '3.0' );
-    $formatted = number_format( $number, 0, null, $wp_locale->number_format['thousands_sep'] );
+    $formatted = number_format( $number, absint( $decimals ), $wp_locale->number_format['decimal_point'], $wp_locale->number_format['thousands_sep'] );
     return apply_filters( 'number_format_i18n', $formatted );
 }
@@ -164 +163 @@
  * @return bool|string False on failure. Number string on success.
  */
-function size_format( $bytes, $decimals = null ) {
+function size_format( $bytes, $decimals = 0 ) {
     $quant = array(
         // ========================= Origin ====
@@ -173 +172 @@
         'B ' => 1,              // pow( 1024, 0)
     );
-    if ( !is_null( $decimals ) ) _deprecated_argument( __FUNCTION__, '3.0' );
     foreach ( $quant as $unit => $mag )
         if ( doubleval($bytes) >= $mag )
-            return number_format_i18n( round( $bytes / $mag ) ) . ' ' . $unit;
+            return number_format_i18n( $bytes / $mag, $decimals ) . ' ' . $unit;
 
     return false;

trunk/wp-includes/load.php

@@ -220 +220 @@
     $timeend = $mtime[1] + $mtime[0];
     $timetotal = $timeend - $timestart;
-    $r = number_format( $timetotal, $precision );
+    $r = ( function_exists( 'number_format_i18n' ) ) ? number_format_i18n( $timetotal, $precision ) : number_format( $timetotal, $precision );
     if ( $display )
         echo $r;

trunk/wp-includes/locale.php

@@ -182 +182 @@
         $trans = __('number_format_thousands_sep');
         $this->number_format['thousands_sep'] = ('number_format_thousands_sep' == $trans) ? ',' : $trans;
+        
+        /* translators: $dec_point argument for http://php.net/number_format, default is . */
+        $trans = __('number_format_decimal_point');
+        $this->number_format['decimal_point'] = ('number_format_decimal_point' == $trans) ? '.' : $trans;
 
         // Import global locale vars set during inclusion of $locale.php.