Jeroen Hoffman pushed to branch master at cms-community / hippo-cms
Commits: 286db122 by Bert Leunis at 2016-09-12T16:11:27+02:00 CMS-10432 use the formatter with the user's locale - - - - - a55155c9 by Jeroen Hoffman at 2016-10-13T12:29:24+02:00 CMS-10432 Merge master changes into bugfix branch - - - - - 711a7288 by Jeroen Hoffman at 2016-10-13T12:33:45+02:00 CMS-10432 Reintegrate bugfix branch into master - - - - - 1 changed file: - api/src/main/java/org/hippoecm/frontend/plugins/standards/datetime/ZonedDateLabel.java Changes: ===================================== api/src/main/java/org/hippoecm/frontend/plugins/standards/datetime/ZonedDateLabel.java ===================================== --- a/api/src/main/java/org/hippoecm/frontend/plugins/standards/datetime/ZonedDateLabel.java +++ b/api/src/main/java/org/hippoecm/frontend/plugins/standards/datetime/ZonedDateLabel.java @@ -20,7 +20,6 @@ import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; import java.time.format.FormatStyle; import java.util.Locale; -import java.util.Optional; import org.apache.commons.lang.StringUtils; import org.apache.wicket.Session; @@ -57,10 +56,10 @@ public class ZonedDateLabel extends Label { @Override public String getObject() { final DateTimeFormatter formatter = DateTimeFormatter.ofLocalizedDate(dateStyle); - formatter.withLocale(getLocale()); + final DateTimeFormatter withLocale = formatter.withLocale(getLocale()); final ZonedDateTime zonedDateTime = model.getObject(); - return zonedDateTime == null ? StringUtils.EMPTY : zonedDateTime.format(formatter); + return zonedDateTime == null ? StringUtils.EMPTY : zonedDateTime.format(withLocale); } private static Locale getLocale() { View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms/compare/6f9560f4a849c263d741a5f2567b4b765f6f07d5...711a72881dd9d862324b2a408bea041049f1fd2e
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn