diff gnv/src/main/webapp/WEB-INF/jsp/includes/display_diagramm_options_inc.jsp @ 967:c7f8a9b4b006

Improved parsing i18n values of chart/histogram options (issue289). gnv/trunk@1129 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Wed, 26 May 2010 17:03:29 +0000
parents c84147a3105c
children 2444da07e487
line wrap: on
line diff
--- a/gnv/src/main/webapp/WEB-INF/jsp/includes/display_diagramm_options_inc.jsp	Tue May 25 14:30:25 2010 +0000
+++ b/gnv/src/main/webapp/WEB-INF/jsp/includes/display_diagramm_options_inc.jsp	Wed May 26 17:03:29 2010 +0000
@@ -9,6 +9,7 @@
 <%@page import="de.intevation.gnv.artifactdatabase.objects.ExportMode"%>
 <%@page import="java.util.Collection"%>
 <%@page import="java.util.Iterator"%>
+<%@page import="java.util.Locale"%>
 <%@page import="java.net.URLEncoder"%>
 <% 
     String exceptionMsg             = (String)request.getAttribute(CommunicationKeys.REQUEST_EXCEPTION_MESSAGE);
@@ -18,6 +19,7 @@
     String targetSVG                = "svg";
     String targetIMG                = "img";
     SessionModel sm                 = SessionModelFactory.getInstance().getSessionModel(request);
+    Locale locale                   = sm.getCurrentLocale();
     OutputMode outputMode           = sm.getOutputMode(target);
     DiagrammOptions diagrammOptions = sm.getDiagrammOptions();
 
@@ -77,13 +79,13 @@
                   </td>
                   <td>
                       <%if (om.getType().equalsIgnoreCase("boolean")){
-                          boolean checked = useDiagrammOptions ? "true".equalsIgnoreCase(diagrammOptions.getValue(om.getName())) : om.getValue().equalsIgnoreCase("true");
+                          boolean checked = useDiagrammOptions ? "true".equalsIgnoreCase(diagrammOptions.getValue(om.getName(), locale)) : om.getValue().equalsIgnoreCase("true");
                       %>
                             <input type="checkbox" 
                                    name="<%=om.getName() %>" 
                                    <%=checked ? " value=\"true\" checked=\"checked\"": "" %>/>
                       <%}else{%>
-                            <input type="text" name="<%=om.getName() %>" value="<%=useDiagrammOptions ? diagrammOptions.getValue(om.getName()): om.getValue()%>"/>
+                            <input type="text" name="<%=om.getName() %>" value="<%=useDiagrammOptions ? diagrammOptions.getValue(om.getName(), locale): om.getValue()%>"/>
                       <%}%>
                   </td>
               </tr>

http://dive4elements.wald.intevation.org