From 7cbf18f4eaa774710c3a252765d15c25b636d657 Mon Sep 17 00:00:00 2001 From: hs-lsong Date: Fri, 31 May 2024 15:17:44 -0400 Subject: [PATCH] Revert "Fix date-time format with configured timezone." --- .../com/hubspot/jinjava/lib/fn/Functions.java | 2 -- .../lib/filter/DateTimeFormatFilterTest.java | 20 ------------------- 2 files changed, 22 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 index 259eb0e9f..396a0f9be 100644 --- a/src/main/java/com/hubspot/jinjava/lib/fn/Functions.java +++ b/src/main/java/com/hubspot/jinjava/lib/fn/Functions.java @@ -213,8 +213,6 @@ 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 index 353778e7c..13761e0b9 100644 --- a/src/test/java/com/hubspot/jinjava/lib/filter/DateTimeFormatFilterTest.java +++ b/src/test/java/com/hubspot/jinjava/lib/filter/DateTimeFormatFilterTest.java @@ -204,24 +204,4 @@ 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(); - } - } }