diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/NavalplannerReportController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/NavalplannerReportController.java index 51085434b..4d0067daf 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/NavalplannerReportController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/NavalplannerReportController.java @@ -23,10 +23,12 @@ package org.navalplanner.web.reports; import java.util.HashMap; import java.util.HashSet; +import java.util.Locale; import java.util.Map; import java.util.Set; import net.sf.jasperreports.engine.JRDataSource; +import net.sf.jasperreports.engine.JRParameter; import org.navalplanner.web.common.components.ExtendedJasperreport; import org.zkoss.util.Locales; @@ -86,6 +88,7 @@ public abstract class NavalplannerReportController extends GenericForwardCompose protected Map getParameters() { Map parameters = new HashMap(); parameters.put("logo", String.format("/logos/%s/logo.png", getLanguage())); + parameters.put(JRParameter.REPORT_LOCALE, getCurrentLocale()); return parameters; } @@ -97,6 +100,17 @@ public abstract class NavalplannerReportController extends GenericForwardCompose return lang; } + private Locale getCurrentLocale() { + String lang = getLanguage(); + if (lang.equals("es")) { + return new Locale("es", "ES"); + } + if (lang.equals("gl")) { + return new Locale("gl", "ES"); + } + return new Locale("en", "US"); + } + protected abstract JRDataSource getDataSource(); protected abstract String getReportName();