Changeset 14184

Timestamp:

04/21/2010 09:41:20 PM (16 years ago)

Author:

westi

Message:

Remove unnecessary translations of decimal point character and number of decimal places. Fixes #10555 props nbachiyski.

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'] ); ?>',
-        decimalPoint = '<?php echo addslashes( $wp_locale->number_format['decimal_point'] ); ?>';
+        thousandsSeparator = '<?php echo addslashes( $wp_locale->number_format['thousands_sep'] ); ?>';
 //]]>
 </script>

trunk/wp-includes/functions.php

@@ -127 +127 @@
 
 /**
- * Convert number to format based on the locale.
+ * Convert integer number to format based on the locale.
  *
  * @since 2.3.0
  *
- * @param mixed $number The number to convert based on locale.
- * @param int $decimals Precision of the number of decimal places.
+ * @param int $number The number to convert based on locale.
+ * @param int $decimals Precision of the number of decimal places. Deprectated.
  * @return string Converted number in string format.
  */
 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 );
-
-        $num = number_format( $number, $decimals, $wp_locale->number_format['decimal_point'], $wp_locale->number_format['thousands_sep'] );
-
-        // let the user translate digits from latin to localized language
-        return apply_filters( 'number_format_i18n', $num );
+        $number = (int)$number;
+        if ( !is_null( $decimals ) ) _deprecated_argument( __FUNCTION__, '3.0' );
+        $formatted = number_format( $number, 0, null, $wp_locale->number_format['thousands_sep'] );
+        return apply_filters( 'number_format_i18n', $formatted );
 }
 
@@ -164 +161 @@
  *
  * @param int|string $bytes Number of bytes. Note max integer size for integers.
- * @param int $decimals Precision of number of decimal places.
+ * @param int $decimals Precision of number of decimal places. Deprecated.
  * @return bool|string False on failure. Number string on success.
  */
@@ -176 +173 @@
                 '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( $bytes / $mag, $decimals ) . ' ' . $unit;
+                        return number_format_i18n( round( $bytes / $mag ) ) . ' ' . $unit;
 
         return false;

trunk/wp-includes/load.php

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

trunk/wp-includes/locale.php

@@ -179 +179 @@
                 // See http://php.net/number_format
 
-                /* translators: $decimals argument for http://php.net/number_format, default is 0 */
-                $trans = __('number_format_decimals');
-                $this->number_format['decimals'] = ('number_format_decimals' == $trans) ? 0 : $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;
-
                 /* translators: $thousands_sep argument for http://php.net/number_format, default is , */
                 $trans = __('number_format_thousands_sep');