Fixed #782 - #numbers.format*() expression utility methods not produc…

…ing numbers using the correct digit symbols for locales that use them, in JDK versions where NumberFormat does this (currently >= JDK15).
thymeleaf · Dec 3, 2020 · 283f70a · 283f70a
1 parent 30e8b8d
commit 283f70a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,5 +1,7 @@
 3.0.12
 ======
+- Fixed #numbers.format*() expression utility methods not producing numbers using the correct digit symbols for
+  locales that use them, in JDK versions where NumberFormat does this (currently >= JDK15).
 - Fixed "package-list" not being produced for JavaDoc since JDK 11 started being used for compiling the project.
 - Updated OGNL dependency to 3.1.26.
 - Updated jackson-databind to 2.11.3 and jackson-datatype to 2.11.3 (due to vulnerabilities in previous versions).

diff --git a/src/main/java/org/thymeleaf/util/NumberUtils.java b/src/main/java/org/thymeleaf/util/NumberUtils.java
@@ -223,7 +223,7 @@ private static DecimalFormatSymbols computeDecimalFormatSymbols(
         Validate.notNull(thousandsPointType, "Thousands point type cannot be null");
         Validate.notNull(locale, "Locale cannot be null");
 
-        final DecimalFormatSymbols symbols = new DecimalFormatSymbols(Locale.US);
+        final DecimalFormatSymbols symbols = new DecimalFormatSymbols(locale);
 
         switch (decimalPointType) {
             case POINT :
@@ -236,8 +236,7 @@ private static DecimalFormatSymbols computeDecimalFormatSymbols(
                 symbols.setDecimalSeparator(' ');
                 break;
             case DEFAULT :
-                final DecimalFormatSymbols dfs = new DecimalFormatSymbols(locale);
-                symbols.setDecimalSeparator(dfs.getDecimalSeparator());
+                // No changes needed to the "symbols" variable defined above
                 break;
             case NONE :
                 // This should never happen
@@ -255,8 +254,7 @@ private static DecimalFormatSymbols computeDecimalFormatSymbols(
                 symbols.setGroupingSeparator(' ');
                 break;
             case DEFAULT :
-                final DecimalFormatSymbols dfs = new DecimalFormatSymbols(locale);
-                symbols.setGroupingSeparator(dfs.getGroupingSeparator());
+                // No changes needed to the "symbols" variable defined above
                 break;
             case NONE :
                 // This should never be shown