Fix grouping commas forcing leading zeroes

Tisawesomeness · Sep 19, 2023 · 59729a1 · 59729a1
1 parent 049d05d
commit 59729a1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/minecord-bot/src/main/java/com/tisawesomeness/minecord/util/type/HumanDecimalFormat.java b/minecord-bot/src/main/java/com/tisawesomeness/minecord/util/type/HumanDecimalFormat.java
@@ -122,7 +122,7 @@ public String format(double d) {
         return addApproxSymbolIfNotExact(scientificNotationFormat, d).toLowerCase(Locale.ROOT);
     }
     private String createPattern(boolean scientificNotation) {
-        String integralPart = includeGroupingCommas ? "0,000" : "0";
+        String integralPart = includeGroupingCommas ? "#,##0" : "0";
         String mantissaPart = scientificNotation ? "E0" : "";
         return String.format("%s.0%s", integralPart, mantissaPart);
     }

diff --git a/minecord-bot/src/test/java/com/tisawesomeness/minecord/util/type/HumanDecimalFormatTest.java b/minecord-bot/src/test/java/com/tisawesomeness/minecord/util/type/HumanDecimalFormatTest.java
@@ -90,7 +90,10 @@ public void testFormatFractionDigits(int minDigits, int maxDigits, double input,
     @ParameterizedTest
     @CsvSource({
             "1234567.0, '1,234,567'",
-            "1234567.89012, '1,234,567.89012'"
+            "1234567.89012, '1,234,567.89012'",
+            "12.0, '12'",
+            "1000000, '1,000,000'",
+            "0.0, '0'"
     })
     public void testFormatGrouping(double input, String expected) {
         HumanDecimalFormat format = HumanDecimalFormat.builder()