From 158a5ba8ce966686c05116d78d8040e06efe6d22 Mon Sep 17 00:00:00 2001 From: barney2k7 Date: Fri, 28 Oct 2016 10:46:54 +0200 Subject: [PATCH] settings client time zone on DateFormat DateFormat would otherwise use the jvm's default time zone, e.g. '4:46:15 AM EDT (and your time zone is Central European Time)' --- .../wicket/examples/ajaxhellobrowser/AjaxHelloBrowser.java | 1 + .../org/apache/wicket/examples/hellobrowser/HelloBrowser.java | 1 + 2 files changed, 2 insertions(+) diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajaxhellobrowser/AjaxHelloBrowser.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ajaxhellobrowser/AjaxHelloBrowser.java index 27cacc7281f..f63f9cdab88 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajaxhellobrowser/AjaxHelloBrowser.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajaxhellobrowser/AjaxHelloBrowser.java @@ -62,6 +62,7 @@ public String getObject() Calendar cal = Calendar.getInstance(timeZone); Locale locale = getLocale(); DateFormat dateFormat = DateFormat.getTimeInstance(DateFormat.LONG, locale); + dateFormat.setTimeZone(timeZone); String calAsString = dateFormat.format(cal.getTime()); StringBuilder b = new StringBuilder("Based on your settings, your time is: "); b.append(calAsString); diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/hellobrowser/HelloBrowser.java b/wicket-examples/src/main/java/org/apache/wicket/examples/hellobrowser/HelloBrowser.java index 415dd061bb2..d901e5fa849 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/hellobrowser/HelloBrowser.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/hellobrowser/HelloBrowser.java @@ -63,6 +63,7 @@ public String getObject() Calendar cal = Calendar.getInstance(timeZone); Locale locale = getLocale(); DateFormat dateFormat = DateFormat.getTimeInstance(DateFormat.LONG, locale); + dateFormat.setTimeZone(timeZone); String calAsString = dateFormat.format(cal.getTime()); StringBuilder b = new StringBuilder("Based on your settings, your time is: "); b.append(calAsString);