Merge pull request #673 from Shallowmallow/FormatNumberFix

Non regex way to for decimal part + locale decimalSeparator

Author: ianharrigan

haxe/ui/util/StringUtil.hx

@@ -87,7 +87,7 @@ class StringUtil {
     }
 
     #if !macro // stringtools gets used in macros, but some functions rely on haxeui "bits" (like locales), lets wrap to avoid problems
-    private static var humanReadableRegex = ~/\B(?=(\d{3})+(?!\d))(?<!\.\d*)/g;
+    private static var humanReadableRegex = ~/\B(?=(\d{3})+(?!\d))/g;
     private static inline var THOUSAND:Int = 1000;
     private static inline var MILLION:Int = THOUSAND * THOUSAND;
     private static inline var BILLION:Int = MILLION * THOUSAND;
@@ -122,13 +122,22 @@ class StringUtil {
                 var p = s.indexOf(".");
                 if (p == -1 && precision > 0) {
                     p = s.length;
-                    s += ".";
+                    s += haxe.ui.locale.Formats.decimalSeparator;
                 }
                 s = StringTools.rpad(s, "0", p + precision + 1);
             }
             s += suffix;
         } else {
-            s = humanReadableRegex.replace(s, haxe.ui.locale.Formats.thousandsSeparator);
+            var decimalSeparatorIndex = s.indexOf(".");
+            if (decimalSeparatorIndex == -1) {
+                s = humanReadableRegex.replace(s, haxe.ui.locale.Formats.thousandsSeparator);
+            } else {
+                var integerPart = s.substring(0, s.indexOf("."));
+                var decimalPart = s.substring(s.indexOf(".") + 1);
+                s = humanReadableRegex.replace(integerPart, haxe.ui.locale.Formats.thousandsSeparator);
+                s += haxe.ui.locale.Formats.decimalSeparator;
+                s += decimalPart;
+            }
         }
 
         return s;