Merge pull request #1188 from HubSpot/fix-date-time-with-timezone

Fix date-time format with configured timezone.
HubSpot · May 31, 2024 · 6670a21 · 6670a21
2 parents c3eb356 + 181ba21
commit 6670a21
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/src/main/java/com/hubspot/jinjava/lib/fn/Functions.java b/src/main/java/com/hubspot/jinjava/lib/fn/Functions.java
@@ -213,6 +213,8 @@ public static String dateTimeFormat(Object var, String... format) {
       zoneOffset = ((ZonedDateTime) var).getZone();
     } else if (var instanceof PyishDate) {
       zoneOffset = ((PyishDate) var).toDateTime().getZone();
+    } else if (interpreter != null) {
+      zoneOffset = interpreter.getConfig().getTimeZone();
     }
 
     if (var == null) {

diff --git a/src/test/java/com/hubspot/jinjava/lib/filter/DateTimeFormatFilterTest.java b/src/test/java/com/hubspot/jinjava/lib/filter/DateTimeFormatFilterTest.java
@@ -204,4 +204,24 @@ public void itUsesDeprecationDateIfNoDateProvided() {
       JinjavaInterpreter.popCurrent();
     }
   }
+
+  @Test
+  public void itUsesTimezoneFromConfigToFormatString() {
+    Jinjava jinjava = new Jinjava(
+      JinjavaConfig
+        .newBuilder()
+        .withTimeZone(ZoneOffset.ofHours(+2))
+        .withLocale(new Locale("da"))
+        .build()
+    );
+    JinjavaInterpreter interpreter = jinjava.newInterpreter();
+    JinjavaInterpreter.pushCurrent(interpreter);
+    try {
+      long timestamp = 1718920800000L; // 2024-06-20 22:00:00 UTC
+      assertThat(filter.filter(timestamp, interpreter, "%b %d, %Y, at %I:%M %p"))
+        .isEqualTo("jun. 21, 2024, at 12:00 AM");
+    } finally {
+      JinjavaInterpreter.popCurrent();
+    }
+  }
 }