Skip to content

Use interpreter locale as default for strftime functions #1109

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

Merged
mattcoley merged 1 commit into from
Aug 22, 2023
Merged

Use interpreter locale as default for strftime functions #1109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 11 additions & 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 @@ -4,6 +4,8 @@
import static com.hubspot.jinjava.objects.date.StrftimeFormatter.ConversionComponent.pattern;

import com.google.common.collect.ImmutableMap;
import com.hubspot.jinjava.JinjavaConfig;
import com.hubspot.jinjava.interpret.JinjavaInterpreter;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeFormatterBuilder;
Expand Down Expand Up @@ -158,7 +160,15 @@ public static String format(ZonedDateTime d, Locale locale) {
}

public static String format(ZonedDateTime d, String strftime) {
return format(d, strftime, Locale.ENGLISH);
return format(
d,
strftime,
JinjavaInterpreter
.getCurrentMaybe()
.map(JinjavaInterpreter::getConfig)
.map(JinjavaConfig::getLocale)
.orElse(Locale.ENGLISH)
);
}

public static String format(ZonedDateTime d, String strftime, Locale locale) {
Expand Down
16 changes: 16 additions & 0 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 @@ -3,6 +3,9 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;

import com.hubspot.jinjava.Jinjava;
import com.hubspot.jinjava.JinjavaConfig;
import com.hubspot.jinjava.interpret.JinjavaInterpreter;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.util.Locale;
Expand Down Expand Up @@ -146,4 +149,17 @@ public void itAllowsLiteralCharacters() {
assertThat(StrftimeFormatter.format(d, "1: day %d month %B"))
.isEqualTo("1: day 06 month November");
}

@Test
public void itUsesInterpreterLocaleAsDefault() {
try {
Jinjava jinjava = new Jinjava(
JinjavaConfig.newBuilder().withLocale(Locale.FRENCH).build()
);
JinjavaInterpreter.pushCurrent(jinjava.newInterpreter());
assertThat(StrftimeFormatter.format(d, "%B %-d, %Y")).isEqualTo("novembre 6, 2013");
} finally {
JinjavaInterpreter.popCurrent();
}
}
}