Implement actual locale-aware datetime formatting (#932)

tkindy · web-flow · commit 6780d72c397f · 2022-10-28T09:15:47.000-04:00
diff --git a/src/main/java/com/hubspot/jinjava/objects/date/StrftimeFormatter.java b/src/main/java/com/hubspot/jinjava/objects/date/StrftimeFormatter.java
@@ -1,5 +1,6 @@
 package com.hubspot.jinjava.objects.date;
 
+import static com.hubspot.jinjava.objects.date.StrftimeFormatter.ConversionComponent.localized;
 import static com.hubspot.jinjava.objects.date.StrftimeFormatter.ConversionComponent.pattern;
 
 import com.google.common.collect.ImmutableMap;
@@ -33,7 +34,7 @@ public class StrftimeFormatter {
         .put('A', pattern("EEEE"))
         .put('b', pattern("MMM"))
         .put('B', pattern("MMMM"))
-        .put('c', pattern("EEE MMM dd HH:mm:ss yyyy"))
+        .put('c', localized(FormatStyle.MEDIUM, FormatStyle.MEDIUM))
         .put('d', pattern("dd"))
         .put('e', pattern("d")) // The day of the month like with %d, but padded with blank (range 1 through 31).
         .put('f', pattern("SSSSSS"))
@@ -50,8 +51,8 @@ public class StrftimeFormatter {
         .put('U', pattern("ww"))
         .put('w', pattern("e"))
         .put('W', pattern("ww"))
-        .put('x', pattern("MM/dd/yy"))
-        .put('X', pattern("HH:mm:ss"))
+        .put('x', localized(FormatStyle.SHORT, null))
+        .put('X', localized(null, FormatStyle.MEDIUM))
         .put('y', pattern("yy"))
         .put('Y', pattern("yyyy"))
         .put('z', pattern("Z"))
@@ -176,5 +177,9 @@ static ConversionComponent pattern(String targetPattern) {
           stripLeadingZero ? targetPattern.substring(1) : targetPattern
         );
     }
+
+    static ConversionComponent localized(FormatStyle dateStyle, FormatStyle timeStyle) {
+      return (builder, stripLeadingZero) -> builder.appendLocalized(dateStyle, timeStyle);
+    }
   }
 }
diff --git a/src/test/java/com/hubspot/jinjava/lib/filter/DateTimeFormatFilterTest.java b/src/test/java/com/hubspot/jinjava/lib/filter/DateTimeFormatFilterTest.java
@@ -116,7 +116,7 @@ public void itConvertsToLocaleSpecificDateTimeFormat() {
           "en-US"
         )
       )
-      .isEqualTo("10/11/18 13:09:45 - Thu Oct 11 13:09:45 2018");
+      .isEqualTo("10/11/18 1:09:45 PM - Oct 11, 2018, 1:09:45 PM");
     assertThat(
         filter.filter(
           1539277785000L,
@@ -126,7 +126,7 @@ public void itConvertsToLocaleSpecificDateTimeFormat() {
           "de-DE"
         )
       )
-      .isEqualTo("10/11/18 13:09:45 - Do. Okt. 11 13:09:45 2018");
+      .isEqualTo("11.10.18 13:09:45 - 11.10.2018, 13:09:45");
   }
 
   @Test
diff --git a/src/test/java/com/hubspot/jinjava/objects/date/StrftimeFormatterTest.java b/src/test/java/com/hubspot/jinjava/objects/date/StrftimeFormatterTest.java
@@ -54,12 +54,12 @@ public void testWithNoPcts() {
 
   @Test
   public void testDateTime() {
-    assertThat(StrftimeFormatter.format(d, "%c")).isEqualTo("Wed Nov 06 14:22:00 2013");
+    assertThat(StrftimeFormatter.format(d, "%c")).isEqualTo("Nov 6, 2013, 2:22:00 PM");
   }
 
   @Test
   public void testDate() {
-    assertThat(StrftimeFormatter.format(d, "%x")).isEqualTo("11/06/13");
+    assertThat(StrftimeFormatter.format(d, "%x")).isEqualTo("11/6/13");
   }
 
   @Test
@@ -69,12 +69,12 @@ public void testDayOfWeekNumber() {
 
   @Test
   public void testTime() {
-    assertThat(StrftimeFormatter.format(d, "%X")).isEqualTo("14:22:00");
+    assertThat(StrftimeFormatter.format(d, "%X")).isEqualTo("2:22:00 PM");
   }
 
   @Test
   public void testMicrosecs() {
-    assertThat(StrftimeFormatter.format(d, "%X %f")).isEqualTo("14:22:00 123000");
+    assertThat(StrftimeFormatter.format(d, "%X %f")).isEqualTo("2:22:00 PM 123000");
   }
 
   @Test

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ public void itConvertsToLocaleSpecificDateTimeFormat() {`
`116`	`116`	`"en-US"`
`117`	`117`	`)`
`118`	`118`	`)`
`119`		`- .isEqualTo("10/11/18 13:09:45 - Thu Oct 11 13:09:45 2018");`
	`119`	`+ .isEqualTo("10/11/18 1:09:45 PM - Oct 11, 2018, 1:09:45 PM");`
`120`	`120`	`assertThat(`
`121`	`121`	`filter.filter(`
`122`	`122`	`1539277785000L,`
`@@ -126,7 +126,7 @@ public void itConvertsToLocaleSpecificDateTimeFormat() {`
`126`	`126`	`"de-DE"`
`127`	`127`	`)`
`128`	`128`	`)`
`129`		`- .isEqualTo("10/11/18 13:09:45 - Do. Okt. 11 13:09:45 2018");`
	`129`	`+ .isEqualTo("11.10.18 13:09:45 - 11.10.2018, 13:09:45");`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -54,12 +54,12 @@ public void testWithNoPcts() {`
`54`	`54`
`55`	`55`	`@Test`
`56`	`56`	`public void testDateTime() {`
`57`		`- assertThat(StrftimeFormatter.format(d, "%c")).isEqualTo("Wed Nov 06 14:22:00 2013");`
	`57`	`+ assertThat(StrftimeFormatter.format(d, "%c")).isEqualTo("Nov 6, 2013, 2:22:00 PM");`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`@Test`
`61`	`61`	`public void testDate() {`
`62`		`- assertThat(StrftimeFormatter.format(d, "%x")).isEqualTo("11/06/13");`
	`62`	`+ assertThat(StrftimeFormatter.format(d, "%x")).isEqualTo("11/6/13");`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`@Test`
`@@ -69,12 +69,12 @@ public void testDayOfWeekNumber() {`
`69`	`69`
`70`	`70`	`@Test`
`71`	`71`	`public void testTime() {`
`72`		`- assertThat(StrftimeFormatter.format(d, "%X")).isEqualTo("14:22:00");`
	`72`	`+ assertThat(StrftimeFormatter.format(d, "%X")).isEqualTo("2:22:00 PM");`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`@Test`
`76`	`76`	`public void testMicrosecs() {`
`77`		`- assertThat(StrftimeFormatter.format(d, "%X %f")).isEqualTo("14:22:00 123000");`
	`77`	`+ assertThat(StrftimeFormatter.format(d, "%X %f")).isEqualTo("2:22:00 PM 123000");`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`@Test`