Index: lams_common/src/java/org/lamsfoundation/lams/web/filter/LocaleFilter.java =================================================================== diff -u -r0e99fe4372b37e742139bb5388c785c06a2a8c90 -rbfc247e092fb4d16a5200b72c831cfb8549d027e --- lams_common/src/java/org/lamsfoundation/lams/web/filter/LocaleFilter.java (.../LocaleFilter.java) (revision 0e99fe4372b37e742139bb5388c785c06a2a8c90) +++ lams_common/src/java/org/lamsfoundation/lams/web/filter/LocaleFilter.java (.../LocaleFilter.java) (revision bfc247e092fb4d16a5200b72c831cfb8549d027e) @@ -25,6 +25,7 @@ import java.io.IOException; import java.util.Locale; +import java.util.TimeZone; import javax.servlet.FilterChain; import javax.servlet.ServletException; @@ -98,17 +99,20 @@ HttpSession session = request.getSession(false); //set locale for STURTS and JSTL + // set the time zone - must be set for dates to display the time zone if (session != null) { if (preferredLocale != null) { session.setAttribute(PREFERRED_LOCALE_KEY, preferredLocale); Config.set(session, Config.FMT_LOCALE, preferredLocale); } + Config.set(session, Config.FMT_TIME_ZONE, TimeZone.getDefault()); } if (preferredLocale != null && !(request instanceof LocaleRequestWrapper)) { request = new LocaleRequestWrapper(request, preferredLocale); LocaleContextHolder.setLocale(preferredLocale); } + chain.doFilter(request, response); // Reset thread-bound LocaleContext.