Skip to content
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

Jump to bottom

Fixes #726 - Sets TimeZone for Freemarker template engine #730

Merged
merged 1 commit into from
Nov 16, 2021
Merged

Fixes #726 - Sets TimeZone for Freemarker template engine #730

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
9 changes: 9 additions & 0 deletions jbake-core/src/main/java/org/jbake/app/configuration/DefaultJBakeConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -702,4 +702,13 @@ public String getAbbreviatedGitHash() {
public String getJvmLocale() {
return getAsString(JVM_LOCALE.getKey());
}

@Override
public TimeZone getFreemarkerTimeZone() {
String timezone = getAsString(FREEMARKER_TIMEZONE.getKey());
if (StringUtils.isNotEmpty(timezone)) {
return TimeZone.getTimeZone(timezone);
}
return null;
}
}
7 changes: 7 additions & 0 deletions jbake-core/src/main/java/org/jbake/app/configuration/JBakeConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.TimeZone;

/**
* JBakeConfiguration gives you access to the project configuration. Typically located in a file called jbake.properties.
Expand Down Expand Up @@ -367,6 +368,12 @@ public interface JBakeConfiguration {
*/
String getJvmLocale();

/**
*
* @return TimeZone to use within Freemarker
*/
TimeZone getFreemarkerTimeZone();

Map<String, Object> asHashMap();

List<Property> getJbakeProperties();
Expand Down
5 changes: 5 additions & 0 deletions jbake-core/src/main/java/org/jbake/app/configuration/PropertyList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,11 @@ public abstract class PropertyList {
"filename to use for feed"
);

public static final Property FREEMARKER_TIMEZONE = new Property(
"freemarker.timezone",
"TimeZone to use within Freemarker"
);

public static final Property GIT_HASH = new Property(
"git.hash",
"abbreviated git hash"
Expand Down
4 changes: 4 additions & 0 deletions jbake-core/src/main/java/org/jbake/template/FreemarkerTemplateEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ private void createTemplateConfiguration() {
templateCfg = new Configuration(Configuration.DEFAULT_INCOMPATIBLE_IMPROVEMENTS);
templateCfg.setDefaultEncoding(config.getRenderEncoding());
templateCfg.setOutputEncoding(config.getOutputEncoding());
if (config.getFreemarkerTimeZone() != null) {
templateCfg.setTimeZone(config.getFreemarkerTimeZone());
templateCfg.setSQLDateAndTimeTimeZone(config.getFreemarkerTimeZone());
}
try {
templateCfg.setDirectoryForTemplateLoading(config.getTemplateFolder());
} catch (IOException e) {
Expand Down