From b2a4fda5f1a344b82769ca85f5a904ec094ce19a Mon Sep 17 00:00:00 2001
From: Diego Pino Garcia <dpino@igalia.com>
Date: Mon, 28 Mar 2011 14:00:33 +0200
Subject: [PATCH] [Bug #949] Translate values of ProgressType in listbox of
 Configuration->'Show Progress'

FEA: ItEr73S04BugFixing
---
 .../web/common/ConfigurationController.java     | 17 +++++++++++++++++
 .../src/main/webapp/common/configuration.zul    |  1 +
 2 files changed, 18 insertions(+)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java
index dff45025d..37a3e1b94 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java
@@ -55,6 +55,7 @@ import org.zkoss.zul.Intbox;
 import org.zkoss.zul.Label;
 import org.zkoss.zul.Listbox;
 import org.zkoss.zul.Listitem;
+import org.zkoss.zul.ListitemRenderer;
 import org.zkoss.zul.Messagebox;
 import org.zkoss.zul.Radio;
 import org.zkoss.zul.Row;
@@ -72,6 +73,8 @@ import org.zkoss.zul.api.Window;
  */
 public class ConfigurationController extends GenericForwardComposer {
 
+    private final ProgressTypeRenderer progressTypeRenderer = new ProgressTypeRenderer();
+
     private Window configurationWindow;
 
     private BandboxSearch defaultCalendarBandboxSearch;
@@ -429,6 +432,20 @@ public class ConfigurationController extends GenericForwardComposer {
         return configurationModel.isScenariosVisible();
     }
 
+    public ProgressTypeRenderer getProgressTypeRenderer() {
+        return progressTypeRenderer;
+    }
+
+    private class ProgressTypeRenderer implements ListitemRenderer {
+
+        @Override
+        public void render(Listitem item, Object data) throws Exception {
+            ProgressType progressType = (ProgressType) data;
+            item.setLabel(_(progressType.getValue()));
+        }
+
+    }
+
     public class EntitySequenceGroupRenderer implements RowRenderer {
         @Override
         public void render(Row row, Object data) throws Exception {
diff --git a/navalplanner-webapp/src/main/webapp/common/configuration.zul b/navalplanner-webapp/src/main/webapp/common/configuration.zul
index 924caceae..aaec99584 100644
--- a/navalplanner-webapp/src/main/webapp/common/configuration.zul
+++ b/navalplanner-webapp/src/main/webapp/common/configuration.zul
@@ -63,6 +63,7 @@
                                 <label value="${i18n:_('Show progress')}" />
                                 <listbox id="lbTypeProgress"
                                     model="@{configurationController.progressTypes}"
+                                    itemRenderer="@{configurationController.progressTypeRenderer}"
                                     selectedItem="@{configurationController.selectedProgressType}"
                                     mold="select" />
                             </row>