Changeset 5308

Timestamp:

04/25/2007 12:49:57 AM (18 years ago)

Author:

rob1n

Message:

Allow number_format to be internationalized. Props nbachiyski. fixes #3677

Location:

trunk

Files:

• wp-admin/admin-functions.php (modified) (1 diff)
• wp-admin/index.php (modified) (2 diffs)
• wp-includes/functions.php (modified) (1 diff)
• wp-includes/locale.php (modified) (1 diff)
• wp-settings.php (modified) (1 diff)

trunk/wp-admin/admin-functions.php

@@ -832 +832 @@
     $class = ( ( defined( 'DOING_AJAX' ) && DOING_AJAX ) || " class='alternate'" == $class ) ? '' : " class='alternate'";
 
-    $category->category_count = number_format( $category->category_count );
-    $category->link_count = number_format( $category->link_count );
+    $category->category_count = number_format_i18n( $category->category_count );
+    $category->link_count = number_format_i18n( $category->link_count );
     $posts_count = ( $category->category_count > 0 ) ? "<a href='edit.php?cat=$category->cat_ID'>$category->category_count</a>" : $category->category_count;
     return "<tr id='cat-$category->cat_ID'$class>

trunk/wp-admin/index.php

@@ -44 +44 @@
 
 <?php if ( $numcomments ) : ?>
-<p><strong><a href="moderation.php"><?php echo sprintf(__('Comments in moderation (%s)'), number_format($numcomments) ); ?> &raquo;</a></strong></p>
+<p><strong><a href="moderation.php"><?php echo sprintf(__('Comments in moderation (%s)'), number_format_i18n($numcomments) ); ?> &raquo;</a></strong></p>
 <?php endif; ?>
 
@@ -104 +104 @@
 $numcats  = (int) $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->categories");
 
-$post_str = sprintf(__ngettext('%1$s <a href="%2$s" title="Posts">post</a>', '%1$s <a href="%2$s" title="Posts">posts</a>', $numposts), number_format($numposts), 'edit.php');
-$comm_str = sprintf(__ngettext('%1$s <a href="%2$s" title="Comments">comment</a>', '%1$s <a href="%2$s" title="Comments">comments</a>', $numcomms), number_format($numcomms), 'edit-comments.php');
-$cat_str  = sprintf(__ngettext('%1$s <a href="%2$s" title="Categories">category</a>', '%1$s <a href="%2$s" title="Categories">categories</a>', $numcats), number_format($numcats), 'categories.php');
+$post_str = sprintf(__ngettext('%1$s <a href="%2$s" title="Posts">post</a>', '%1$s <a href="%2$s" title="Posts">posts</a>', $numposts), number_format_i18n($numposts), 'edit.php');
+$comm_str = sprintf(__ngettext('%1$s <a href="%2$s" title="Comments">comment</a>', '%1$s <a href="%2$s" title="Comments">comments</a>', $numcomms), number_format_i18n($numcomms), 'edit-comments.php');
+$cat_str  = sprintf(__ngettext('%1$s <a href="%2$s" title="Categories">category</a>', '%1$s <a href="%2$s" title="Categories">categories</a>', $numcats), number_format_i18n($numcats), 'categories.php');
 ?>
 

trunk/wp-includes/functions.php

@@ -82 +82 @@
     $j = @date($dateformatstring, $i);
     return $j;
+}
+
+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);
+
+    return number_format($number, $decimals, $wp_locale->number_format['decimal_point'], $wp_locale->number_format['thousands_sep']);
 }
 

trunk/wp-includes/locale.php

@@ -88 +88 @@
         $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 ) {

trunk/wp-settings.php

@@ -70 +70 @@
     $timeend = $mtime;
     $timetotal = $timeend-$timestart;
-    $r = number_format($timetotal, $precision);
+    $r = number_format_i18n($timetotal, $precision);
     if ( $display )
         echo $r;