Change default format string for decimal datatype #967

jmix-framework · Feb 10, 2023 · 277c3f7 · 277c3f7
1 parent 627322d
commit 277c3f7
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 13 deletions.
diff --git a/jmix-core/core/src/main/resources/io/jmix/core/messages.properties b/jmix-core/core/src/main/resources/io/jmix/core/messages.properties
@@ -26,7 +26,7 @@ offsetDateTimeFormat=dd/MM/yyyy HH:mm Z
 #Number formats
 integerFormat=#,##0
 doubleFormat=#,##0.###
-decimalFormat=#,##0.##
+decimalFormat=#,##0.00
 
 # Number separators
 numberDecimalSeparator=.

diff --git a/jmix-core/core/src/test/groovy/format_strings/TestFormatStringsRegistry.groovy b/jmix-core/core/src/test/groovy/format_strings/TestFormatStringsRegistry.groovy
@@ -26,7 +26,7 @@ class TestFormatStringsRegistry extends FormatStringsRegistryImpl {
     TestFormatStringsRegistry() {
         setFormatStrings(Locale.ENGLISH, new FormatStrings(
                 '.' as char, ',' as char,
-                '#,##0', '#,##0.###', '#,##0.##',
+                '#,##0', '#,##0.###', '#,##0.00',
                 'dd/MM/yyyy', 'dd/MM/yyyy HH:mm', 'dd/MM/yyyy HH:mm', 'HH:mm', 'HH:mm',
                 'True', 'False'))
     }

diff --git a/...reports-ui/src/main/java/io/jmix/reportsui/screen/valueformat/edit/ValueFormatEditor.java b/...reports-ui/src/main/java/io/jmix/reportsui/screen/valueformat/edit/ValueFormatEditor.java
@@ -50,6 +50,7 @@ public class ValueFormatEditor extends StandardEditor<ReportValueFormat> {
             "##,##0",
             "#,##0.###",
             "#,##0.##",
+            "#,##0.00",
             "dd/MM/yyyy HH:mm",
             "${image:WxH}",
             "${bitmap:WxH}",

diff --git a/jmix-translations/content/io/jmix/core/messages.properties b/jmix-translations/content/io/jmix/core/messages.properties
@@ -26,7 +26,7 @@ offsetDateTimeFormat=dd/MM/yyyy HH:mm Z
 #Number formats
 integerFormat=#,##0
 doubleFormat=#,##0.###
-decimalFormat=#,##0.##
+decimalFormat=#,##0.00
 
 # Number separators
 numberDecimalSeparator=.

diff --git a/jmix-translations/content/io/jmix/core/messages_ckb.properties b/jmix-translations/content/io/jmix/core/messages_ckb.properties
@@ -26,7 +26,7 @@ offsetDateTimeFormat=dd/MM/yyyy HH:mm Z
 #Number formats
 integerFormat=#,##0
 doubleFormat=#,##0.###
-decimalFormat=#,##0.##
+decimalFormat=#,##0.00
 
 # Number separators
 numberDecimalSeparator=.

diff --git a/jmix-translations/content/io/jmix/core/messages_de.properties b/jmix-translations/content/io/jmix/core/messages_de.properties
@@ -26,7 +26,7 @@ offsetDateTimeFormat= dd.MM.yyyy HH:mm Z
 #Number formats
 integerFormat= #,##0
 doubleFormat= #,##0.###
-decimalFormat= #,##0.##
+decimalFormat= #,##0.00
 
 # Number separators
 numberDecimalSeparator= ,

diff --git a/jmix-translations/content/io/jmix/core/messages_el.properties b/jmix-translations/content/io/jmix/core/messages_el.properties
@@ -23,7 +23,7 @@ offsetDateTimeFormat=dd/MM/yyyy HH:mm Z
 #Number formats
 integerFormat=#,##0
 doubleFormat=#,##0.###
-decimalFormat=#,##0.##
+decimalFormat=#,##0.00
 
 # Number separators
 numberDecimalSeparator=,

diff --git a/jmix-translations/content/io/jmix/core/messages_fr.properties b/jmix-translations/content/io/jmix/core/messages_fr.properties
@@ -26,7 +26,7 @@ offsetDateTimeFormat=dd/MM/yyyy HH:mm Z
 #Number formats
 integerFormat = #,##0
 doubleFormat = #,##0.###
-decimalFormat = #,##0.##
+decimalFormat = #,##0.00
 
 # Number separators
 numberDecimalSeparator = ,

diff --git a/jmix-translations/content/io/jmix/core/messages_nl.properties b/jmix-translations/content/io/jmix/core/messages_nl.properties
@@ -26,7 +26,7 @@ offsetDateTimeFormat=dd/MM/yyyy HH:mm Z
 #Number formats
 integerFormat=#,##0
 doubleFormat=#,##0.###
-decimalFormat=#,##0.##
+decimalFormat=#,##0.00
 
 # Number separators
 numberDecimalSeparator=,

diff --git a/jmix-translations/content/io/jmix/core/messages_ro.properties b/jmix-translations/content/io/jmix/core/messages_ro.properties
@@ -25,7 +25,7 @@ offsetDateTimeFormat=dd/MM/yyyy HH:mm Z
 #Number formats
 integerFormat=#,##0
 doubleFormat=#,##0.###
-decimalFormat=#,##0.##
+decimalFormat=#,##0.00
 
 # Number separators
 numberDecimalSeparator=.

diff --git a/jmix-translations/content/io/jmix/core/messages_ru.properties b/jmix-translations/content/io/jmix/core/messages_ru.properties
@@ -26,7 +26,7 @@ offsetDateTimeFormat=dd/MM/yyyy HH:mm Z
 #Number formats
 integerFormat=#,##0
 doubleFormat=#,##0.###
-decimalFormat=#,##0.##
+decimalFormat=#,##0.00
 
 # Number separators
 numberDecimalSeparator=,

diff --git a/jmix-translations/content/io/jmix/core/messages_zh_CN.properties b/jmix-translations/content/io/jmix/core/messages_zh_CN.properties
@@ -24,7 +24,7 @@ timeFormat=HH:mm
 #Number formats
 integerFormat=#,##0
 doubleFormat=#,##0.###
-decimalFormat=#,##0.##
+decimalFormat=#,##0.00
 
 # Number separators
 numberDecimalSeparator=.

diff --git a/jmix-ui/pivot-table/src/test/java/serializer/PivotTableSerializerTest.java b/jmix-ui/pivot-table/src/test/java/serializer/PivotTableSerializerTest.java
@@ -71,7 +71,7 @@ public void setupTest() {
 
         formatStringsRegistry.setFormatStrings(Locale.ENGLISH, new FormatStrings(
                 '.', ',',
-                "#,##0", "#,##0.###", "#,##0.##",
+                "#,##0", "#,##0.###", "#,##0.00",
                 "dd/MM/yyyy", "dd/MM/yyyy HH:mm", "dd/MM/yyyy HH:mm Z", "HH:mm", "HH:mm Z",
                 "True", "False"));
 

diff --git a/jmix-ui/ui-test-assist/src/main/java/io/jmix/ui/testassist/UiTestAssistConfiguration.java b/jmix-ui/ui-test-assist/src/main/java/io/jmix/ui/testassist/UiTestAssistConfiguration.java
@@ -50,7 +50,7 @@ public void init(ContextRefreshedEvent event) {
 
         formatStringsRegistry.setFormatStrings(Locale.ENGLISH, new FormatStrings(
                 '.', ',',
-                "#,##0", "#,##0.###", "#,##0.##",
+                "#,##0", "#,##0.###", "#,##0.00",
                 "dd/MM/yyyy", "dd/MM/yyyy HH:mm", "dd/MM/yyyy HH:mm Z", "HH:mm", "HH:mm Z",
                 "True", "False"));
     }