From c03f5e76fb14b70e34f5de899d5ba27760d77787 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Mon, 16 Jan 2012 07:55:45 +0100 Subject: [PATCH] i18: Remove unneeded code to manage languages in reports FEA: ItEr76S03Community --- .../reports/LibrePlanReportController.java | 26 +------------------ 1 file changed, 1 insertion(+), 25 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 d4ad3e7dc..29892dbe1 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 @@ -22,10 +22,7 @@ package org.libreplan.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; @@ -62,15 +59,6 @@ public abstract class LibrePlanReportController extends GenericForwardComposer { protected A URIlink; - private static Set supportedLanguages = new HashSet() {{ - add("en"); - add("es"); - add("gl"); - add("it"); - }}; - - private final String DEFAULT_LANG = "en"; - public void showReport(JasperreportComponent jasperreport){ final String type = outputFormat.getOutputFormat(); @@ -109,22 +97,10 @@ public abstract class LibrePlanReportController extends GenericForwardComposer { companyLogo = "/logos/logo.png"; } parameters.put("logo", companyLogo); - parameters.put(JRParameter.REPORT_LOCALE, getCurrentLocale()); + parameters.put(JRParameter.REPORT_LOCALE, Locales.getCurrent()); return parameters; } - private String getLanguage() { - String lang = Locales.getCurrent().getLanguage(); - if (!supportedLanguages.contains(lang)) { - lang = DEFAULT_LANG; - } - return lang; - } - - private Locale getCurrentLocale() { - return new Locale(getLanguage()); - } - protected abstract JRDataSource getDataSource(); protected abstract String getReportName();