Merge pull request #671 from Shallowmallow/BetterThousandSeparator

ianharrigan · web-flow · commit ebdc0d94f509 · 2025-04-07T11:36:55.000+02:00
Negative lookbehind to ensure the match is not part of the decimal fr…
diff --git a/haxe/ui/util/StringUtil.hx b/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))/g;
+    private static var humanReadableRegex = ~/\B(?=(\d{3})+(?!\d))(?<!\.\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;

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ class StringUtil {`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`#if !macro // stringtools gets used in macros, but some functions rely on haxeui "bits" (like locales), lets wrap to avoid problems`
`90`		`- private static var humanReadableRegex = ~/\B(?=(\d{3})+(?!\d))/g;`
	`90`	`+ private static var humanReadableRegex = ~/\B(?=(\d{3})+(?!\d))(?<!\.\d*)/g;`
`91`	`91`	`private static inline var THOUSAND:Int = 1000;`
`92`	`92`	`private static inline var MILLION:Int = THOUSAND * THOUSAND;`
`93`	`93`	`private static inline var BILLION:Int = MILLION * THOUSAND;`