Repository: wicket Updated Branches: refs/heads/wicket-7.x 7d09f5a6e -> 7ba197c68
Fixed to use locale of the session Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/7ba197c6 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/7ba197c6 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/7ba197c6 Branch: refs/heads/wicket-7.x Commit: 7ba197c68508f2e15abf5e4bdda046cd4fa14087 Parents: 7d09f5a Author: Ryo <[email protected]> Authored: Mon Feb 12 19:10:50 2018 +0900 Committer: Tobias Soloschenko <[email protected]> Committed: Sat Feb 17 14:51:41 2018 +0100 ---------------------------------------------------------------------- .../validation/validator/DateValidator.java | 21 +++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/7ba197c6/wicket-core/src/main/java/org/apache/wicket/validation/validator/DateValidator.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/validation/validator/DateValidator.java b/wicket-core/src/main/java/org/apache/wicket/validation/validator/DateValidator.java index b215114..6b00c4d 100644 --- a/wicket-core/src/main/java/org/apache/wicket/validation/validator/DateValidator.java +++ b/wicket-core/src/main/java/org/apache/wicket/validation/validator/DateValidator.java @@ -18,7 +18,9 @@ package org.apache.wicket.validation.validator; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.Locale; +import org.apache.wicket.Session; import org.apache.wicket.validation.IValidatable; import org.apache.wicket.validation.IValidationError; import org.apache.wicket.validation.ValidationError; @@ -186,7 +188,24 @@ public class DateValidator extends RangeValidator<Date> // format variables if format has been specified if (format != null) { - SimpleDateFormat sdf = new SimpleDateFormat(format); + Locale locale; + + if (Session.exists()) + { + Session session = Session.get(); + locale = session.getLocale(); + + if (locale == null) + { + locale = Locale.getDefault(Locale.Category.FORMAT); + } + } + else + { + locale = Locale.getDefault(Locale.Category.FORMAT); + } + + SimpleDateFormat sdf = new SimpleDateFormat(format, locale); if (getMinimum() != null) { ve.setVariable("minimum", sdf.format(getMinimum()));
