From 6e00967a54deb5c6cf4e92e644b88a4a6a4c214f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Tue, 3 Aug 2010 17:48:30 +0200 Subject: [PATCH] ItEr60S04ValidacionEProbasFuncionaisItEr59S04: Keep previously used locale on callback call. This ensures that the same locale is when rendering the page for printing. --- .../src/main/java/org/navalplanner/web/print/CutyPrint.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java index 662777293..89abf59c5 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java @@ -33,6 +33,7 @@ import java.text.SimpleDateFormat; import java.util.Collections; import java.util.Date; import java.util.HashMap; +import java.util.Locale; import java.util.Map; import javax.servlet.ServletException; @@ -48,6 +49,7 @@ import org.springframework.security.context.SecurityContextHolder; import org.zkoss.ganttz.Planner; import org.zkoss.ganttz.servlets.CallbackServlet; import org.zkoss.ganttz.servlets.CallbackServlet.IServletRequestHandler; +import org.zkoss.util.Locales; import org.zkoss.zk.ui.Executions; public class CutyPrint { @@ -234,11 +236,13 @@ public class CutyPrint { final IServletRequestHandler original) { final SecurityContext originalContext = SecurityContextHolder .getContext(); + final Locale current = Locales.getCurrent(); return new IServletRequestHandler() { @Override public void handle(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + Locales.setThreadLocal(current); SecurityContextHolder.setContext(originalContext); original.handle(request, response); }