From 25734e7132102e7ba7d746b2fabe39b934d1489b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Thu, 17 Sep 2009 14:14:18 +0200
Subject: [PATCH] ItEr26S03ContornaItEr25S03: Fixing problem at error popup

---
 .../java/org/navalplanner/web/common/components/I18n.java   | 6 ++++++
 .../org/navalplanner/web/error/PageForErrorOnEvent.java     | 4 +++-
 .../src/main/webapp/common/components/i18n.zul              | 2 +-
 navalplanner-webapp/src/main/webapp/common/event_error.zul  | 3 ++-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/I18n.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/I18n.java
index 865dd6ec0..2cc9774bb 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/I18n.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/I18n.java
@@ -2,6 +2,7 @@ package org.navalplanner.web.common.components;
 
 import org.navalplanner.web.I18nHelper;
 import org.zkoss.zk.ui.HtmlMacroComponent;
+import org.zkoss.zul.Label;
 
 /**
  * ZK macro component for translating texts created dinamically, that means,
@@ -82,4 +83,9 @@ public class I18n extends HtmlMacroComponent {
 
         return I18nHelper._(value);
     }
+
+    public void forceLoad() {
+        Label label = (Label) getFellow("i18nlabel");
+        label.setValue(getI18n());
+    }
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/error/PageForErrorOnEvent.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/error/PageForErrorOnEvent.java
index f50e47385..bfd737e02 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/error/PageForErrorOnEvent.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/error/PageForErrorOnEvent.java
@@ -4,6 +4,7 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.navalplanner.web.common.components.I18n;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.Executions;
 import org.zkoss.zk.ui.util.GenericForwardComposer;
@@ -19,7 +20,8 @@ public class PageForErrorOnEvent extends GenericForwardComposer {
         super.doAfterCompose(comp);
         logError();
         modalWindow = comp;
-
+        I18n fellow = (I18n) modalWindow.getFellow("message");
+        fellow.forceLoad();
     }
 
     private void logError() {
diff --git a/navalplanner-webapp/src/main/webapp/common/components/i18n.zul b/navalplanner-webapp/src/main/webapp/common/components/i18n.zul
index 273ce8cdb..fd801f213 100644
--- a/navalplanner-webapp/src/main/webapp/common/components/i18n.zul
+++ b/navalplanner-webapp/src/main/webapp/common/components/i18n.zul
@@ -4,5 +4,5 @@
 	]]>
 	</zscript>
 
-	<label value="@{top.i18n}" />
+	<label id="i18nlabel" value="@{top.i18n}" />
 </zk>
diff --git a/navalplanner-webapp/src/main/webapp/common/event_error.zul b/navalplanner-webapp/src/main/webapp/common/event_error.zul
index 19c5afdef..482a3242a 100644
--- a/navalplanner-webapp/src/main/webapp/common/event_error.zul
+++ b/navalplanner-webapp/src/main/webapp/common/event_error.zul
@@ -2,7 +2,8 @@
     width="400px" border="normal" mode="modal"
     apply="org.navalplanner.web.error.PageForErrorOnEvent">
     <vbox>
-        <i18n value="Run-time error: {0} . Error was registered and it&#039;ll be fixed as soon as possible." arg0="${requestScope['javax.servlet.error.message']}" />
+        <i18n id="message"
+            value="Run-time error: {0} . Error was registered and it&#039;ll be fixed as soon as possible." arg0="${requestScope['javax.servlet.error.message']}" />
         <hbox style="margin-left:auto; margin-right:auto">
             <button id="continueWorking" label="${i18n:_('Continue')}" />
             <button id="reload" label="${i18n:_('Reload')}" />