From 3aa99e72613c328de90b3d8600bf54c482e0b79f Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Sat, 14 Jan 2012 18:56:11 +0100 Subject: [PATCH] i18n: Add support to Italian language in reports Take advantage to simplify the code to calculate the locale FEA: ItEr76S03Community --- .../web/reports/LibrePlanReportController.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/reports/LibrePlanReportController.java b/libreplan-webapp/src/main/java/org/libreplan/web/reports/LibrePlanReportController.java index fcdeb616c..d4ad3e7dc 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/reports/LibrePlanReportController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/reports/LibrePlanReportController.java @@ -32,7 +32,6 @@ import net.sf.jasperreports.engine.JRParameter; import org.apache.commons.lang.StringUtils; import org.libreplan.business.common.Registry; -import org.springframework.transaction.annotation.Transactional; import org.zkoss.util.Locales; import org.zkoss.zk.au.out.AuDownload; import org.zkoss.zk.ui.Executions; @@ -64,9 +63,10 @@ public abstract class LibrePlanReportController extends GenericForwardComposer { protected A URIlink; private static Set supportedLanguages = new HashSet() {{ - add("es"); add("en"); + add("es"); add("gl"); + add("it"); }}; private final String DEFAULT_LANG = "en"; @@ -122,14 +122,7 @@ public abstract class LibrePlanReportController extends GenericForwardComposer { } 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"); + return new Locale(getLanguage()); } protected abstract JRDataSource getDataSource();