Skip to content

Fix datetime zone output. #368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mattcoley wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix datetime zone output. #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83c1d3e
Fix datetime zone output.
Aug 28, 2019
bd53c60
Fix tests
Aug 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/com/hubspot/jinjava/objects/date/StrftimeFormatter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public class StrftimeFormatter {
CONVERSIONS['y'] = "yy";
CONVERSIONS['Y'] = "yyyy";
CONVERSIONS['z'] = "Z";
CONVERSIONS['Z'] = "ZZZZ";
CONVERSIONS['Z'] = "z";
CONVERSIONS['%'] = "%";

NOMINATIVE_CONVERSIONS['B'] = "LLLL";
Expand Down
10 changes: 10 additions & 0 deletions src/test/java/com/hubspot/jinjava/lib/filter/DateTimeFormatFilterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,16 @@ public void itSupportsTimezones() throws Exception {
assertThat(filter.filter(1539277785000L, interpreter, "%B %d, %Y, at %I:%M %p", "UTC+8")).isEqualTo("October 12, 2018, at 01:09 AM");
}

@Test
public void itOutputsTimezoneName() {
assertThat(filter.filter(1539277785000L, interpreter, "%l:%M %p %Z", "America/Los_Angeles")).isEqualTo("10:09 AM PDT");
}

@Test
public void itOutputsTimezoneOffset() {
assertThat(filter.filter(1539277785000L, interpreter, "%l:%M %p %z", "America/Los_Angeles")).isEqualTo("10:09 AM -0700");
}

@Test(expected = InvalidDateFormatException.class)
public void itThrowsExceptionOnInvalidTimezone() throws Exception {
filter.filter(1539277785000L, interpreter, "%B %d, %Y, at %I:%M %p", "Not a timezone");
Expand Down
6 changes: 4 additions & 2 deletions src/test/java/com/hubspot/jinjava/objects/date/StrftimeFormatterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import static org.assertj.core.api.Assertions.assertThat;

import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.util.Locale;

Expand Down Expand Up @@ -85,8 +86,9 @@ public void testFinnishMonths() {

@Test
public void testZoneOutput() {
assertThat(StrftimeFormatter.format(d, "%z")).isEqualTo("+0000");
assertThat(StrftimeFormatter.format(d, "%Z")).isEqualTo("GMT");
d = ZonedDateTime.of(d.toLocalDateTime(), ZoneId.of("America/Los_Angeles"));
assertThat(StrftimeFormatter.format(d, "%z")).isEqualTo("-0800");
assertThat(StrftimeFormatter.format(d, "%Z")).isEqualTo("PST");
}

@Test
Expand Down