[Web-erp-svn] SF.net SVN: web-erp:[4710] trunk

[<dai...@us...>]

Revision: 4710
          http://web-erp.svn.sourceforge.net/web-erp/?rev=4710&view=rev
Author:   daintree
Date:     2011-10-02 09:51:33 +0000 (Sun, 02 Oct 2011)
Log Message:
-----------
number_formats

Modified Paths:
--------------
    trunk/Numbers/Words/lang.bg.php
    trunk/Numbers/Words/lang.fr.php
    trunk/Numbers/Words/lang.fr_BE.php
    trunk/includes/phplot/phplot.php
    trunk/includes/tcpdf/tcpdf.php

Modified: trunk/Numbers/Words/lang.bg.php
===================================================================
--- trunk/Numbers/Words/lang.bg.php	2011-10-02 09:45:55 UTC (rev 4709)
+++ trunk/Numbers/Words/lang.bg.php	2011-10-02 09:51:33 UTC (rev 4710)
@@ -318,7 +318,7 @@
             return $ret;
         }
         else
-            return explode(' ', locale_number_format($num, 0, '', ' ')); // a faster version for integers
+            return explode(' ', number_format($num, 0, '', ' ')); // a faster version for integers
     }
     // }}}
 

Modified: trunk/Numbers/Words/lang.fr.php
===================================================================
--- trunk/Numbers/Words/lang.fr.php	2011-10-02 09:45:55 UTC (rev 4709)
+++ trunk/Numbers/Words/lang.fr.php	2011-10-02 09:51:33 UTC (rev 4710)
@@ -271,7 +271,7 @@
             return $ret;
         }
         else
-            return explode(' ', locale_number_format($num, 0, '', ' ')); // a faster version for integers
+            return explode(' ', number_format($num, 0, '', ' ')); // a faster version for integers
     }
     // }}}
 

Modified: trunk/Numbers/Words/lang.fr_BE.php
===================================================================
--- trunk/Numbers/Words/lang.fr_BE.php	2011-10-02 09:45:55 UTC (rev 4709)
+++ trunk/Numbers/Words/lang.fr_BE.php	2011-10-02 09:51:33 UTC (rev 4710)
@@ -275,7 +275,7 @@
             return $ret;
         }
         else
-            return explode(' ', locale_number_format($num, 0, '', ' ')); // a faster version for integers
+            return explode(' ', number_format($num, 0, '', ' ')); // a faster version for integers
     }
     // }}}
 

Modified: trunk/includes/phplot/phplot.php
===================================================================
--- trunk/includes/phplot/phplot.php	2011-10-02 09:45:55 UTC (rev 4709)
+++ trunk/includes/phplot/phplot.php	2011-10-02 09:51:33 UTC (rev 4710)
@@ -2377,11 +2377,11 @@
 
     /*
      * Format a floating-point number.
-     * This is like PHP's locale_number_format, but uses class variables for separators.
+     * This is like PHP's number_format, but uses class variables for separators.
      * The separators will default to locale-specific values, if available.
      * Note: This method should be 'protected', but is called from test script(s).
      */
-    function locale_number_format($number, $decimals=0)
+    function number_format($number, $decimals=0)
     {
         if (!isset($this->decimal_point) || !isset($this->thousands_sep)) {
             // Load locale-specific values from environment, unless disabled:
@@ -2399,7 +2399,7 @@
               $this->thousands_sep = ',';
             }
         }
-        return locale_number_format($number, $decimals, $this->decimal_point, $this->thousands_sep);
+        return number_format($number, $decimals, $this->decimal_point, $this->thousands_sep);
     }
 
     /*
@@ -3596,7 +3596,7 @@
                 break;
             case 'data':
                 $which_lab = $format['prefix']
-                           . $this->locale_number_format($which_lab, $format['precision'])
+                           . $this->number_format($which_lab, $format['precision'])
                            . $this->data_units_text  // Obsolete
                            . $format['suffix'];
                 break;
@@ -4533,7 +4533,7 @@
                 else
                     $slicecol = $this->ndx_data_dark_colors[$color_index];
 
-                $label_txt = $this->locale_number_format(($val / $total * 100), $precision) . '%';
+                $label_txt = $this->number_format(($val / $total * 100), $precision) . '%';
                 $val = 360 * ($val / $total);
 
                 // NOTE that imagefilledarc measures angles CLOCKWISE (go figure why),

Modified: trunk/includes/tcpdf/tcpdf.php
===================================================================
--- trunk/includes/tcpdf/tcpdf.php	2011-10-02 09:45:55 UTC (rev 4709)
+++ trunk/includes/tcpdf/tcpdf.php	2011-10-02 09:51:33 UTC (rev 4710)
@@ -11772,7 +11772,7 @@
 		 * @since 4.2.005 (2008-11-06)
 		 */
 		protected function formatPageNumber($num) {
-			return locale_number_format((float)$num, 0, '', '.');
+			return number_format((float)$num, 0, '', '.');
 		}
 
 		/**
@@ -11784,7 +11784,7 @@
 		 * @see addTOC()
 		 */
 		protected function formatTOCPageNumber($num) {
-			return locale_number_format((float)$num, 0, '', '.');
+			return number_format((float)$num, 0, '', '.');
 		}
 
         /**

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.