Fixed locale issues with day and month patterns

apache · Apr 25, 2024 · f523190 · f523190
1 parent c04f7e1
commit f523190
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/core/src/main/java/org/apache/calcite/util/format/PostgresqlDateTimeFormatter.java b/core/src/main/java/org/apache/calcite/util/format/PostgresqlDateTimeFormatter.java
@@ -422,25 +422,25 @@ protected StringFormatPattern(Function<ZonedDateTime, String> converter, String.
           dt -> {
             final String monthName =
                 dt.getMonth().getDisplayName(TextStyle.SHORT,
-                Locale.getDefault());
-            return monthName.substring(0, monthName.length() - 1).toUpperCase(Locale.ROOT);
+                Locale.ROOT);
+            return monthName.toUpperCase(Locale.ROOT);
           },
           "MON"),
       new StringFormatPattern(
           dt -> {
             final String monthName =
                 dt.getMonth().getDisplayName(TextStyle.SHORT,
-                Locale.getDefault());
+                Locale.ROOT);
             return monthName.substring(0, 1).toUpperCase(Locale.ROOT)
-                + monthName.substring(1, monthName.length() - 1).toLowerCase(Locale.ROOT);
+                + monthName.substring(1).toLowerCase(Locale.ROOT);
           },
           "Mon"),
       new StringFormatPattern(
           dt -> {
             final String monthName =
                 dt.getMonth().getDisplayName(TextStyle.SHORT,
-                Locale.getDefault());
-            return monthName.substring(0, monthName.length() - 1).toLowerCase(Locale.ROOT);
+                Locale.ROOT);
+            return monthName.toLowerCase(Locale.ROOT);
           },
           "mon"),
       new NumberFormatPattern(
@@ -468,26 +468,26 @@ protected StringFormatPattern(Function<ZonedDateTime, String> converter, String.
       new StringFormatPattern(
           dt -> {
             final String dayString =
-                dt.getDayOfWeek().getDisplayName(TextStyle.SHORT, Locale.getDefault())
+                dt.getDayOfWeek().getDisplayName(TextStyle.SHORT, Locale.ROOT)
                     .toUpperCase(Locale.ROOT);
-            return dayString.substring(0, dayString.length() - 1);
+            return dayString.toUpperCase(Locale.ROOT);
           },
           "DY"),
       new StringFormatPattern(
           dt -> {
             final String dayName =
                 dt.getDayOfWeek().getDisplayName(TextStyle.SHORT,
-                Locale.getDefault());
+                Locale.ROOT);
             return dayName.substring(0, 1).toUpperCase(Locale.ROOT)
-                + dayName.substring(1, dayName.length() - 1);
+                + dayName.substring(1).toLowerCase(Locale.ROOT);
           },
           "Dy"),
       new StringFormatPattern(
           dt -> {
             final String dayString =
-                dt.getDayOfWeek().getDisplayName(TextStyle.SHORT, Locale.getDefault())
+                dt.getDayOfWeek().getDisplayName(TextStyle.SHORT, Locale.ROOT)
                     .toLowerCase(Locale.ROOT);
-            return dayString.substring(0, dayString.length() - 1);
+            return dayString.toLowerCase(Locale.ROOT);
           },
           "dy"),
       new NumberFormatPattern(
@@ -551,12 +551,12 @@ protected StringFormatPattern(Function<ZonedDateTime, String> converter, String.
       new StringFormatPattern(
           dt -> String.format(Locale.ROOT, "%3s",
               dt.getZone().getDisplayName(TextStyle.SHORT,
-                  Locale.getDefault())).toUpperCase(Locale.ROOT),
+                  Locale.ROOT)).toUpperCase(Locale.ROOT),
           "TZ"),
       new StringFormatPattern(
           dt -> String.format(Locale.ROOT, "%3s",
               dt.getZone().getDisplayName(TextStyle.SHORT,
-                  Locale.getDefault())).toLowerCase(Locale.ROOT),
+                  Locale.ROOT)).toLowerCase(Locale.ROOT),
           "tz"),
       new StringFormatPattern(
           dt -> {