From ecfc98d41caac76a88c679125a1aca3ce543f4f7 Mon Sep 17 00:00:00 2001
From: Diego Pino Garcia <dpino@igalia.com>
Date: Wed, 19 Aug 2009 17:14:39 +0200
Subject: [PATCH]  ItEr22S04ArquitecturaServidorItEr21S04: Extend i18n tag so
 it can receive one extra parameter (only useful if that parameter is not a
 data binding)

---
 .../src/main/webapp/WEB-INF/tld/i18n.tld              | 11 +++++++++++
 .../src/main/webapp/common/event_error.zul            |  2 +-
 navalplanner-webapp/src/scripts/gettext_zul.pl        |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/navalplanner-webapp/src/main/webapp/WEB-INF/tld/i18n.tld b/navalplanner-webapp/src/main/webapp/WEB-INF/tld/i18n.tld
index 32d5b8173..69d8ff377 100644
--- a/navalplanner-webapp/src/main/webapp/WEB-INF/tld/i18n.tld
+++ b/navalplanner-webapp/src/main/webapp/WEB-INF/tld/i18n.tld
@@ -12,4 +12,15 @@
         <description>
         </description>
     </function>
+
+    <!-- Pass one extra argument -->
+    <function>
+        <name>__</name>
+        <function-class>org.navalplanner.web.I18nHelper</function-class>
+        <function-signature>
+            java.lang.String _(java.lang.String name, java.lang.Object arg0)
+        </function-signature>
+        <description>
+        </description>
+    </function>
 </taglib>
diff --git a/navalplanner-webapp/src/main/webapp/common/event_error.zul b/navalplanner-webapp/src/main/webapp/common/event_error.zul
index 9f567d8ab..83fd93df0 100644
--- a/navalplanner-webapp/src/main/webapp/common/event_error.zul
+++ b/navalplanner-webapp/src/main/webapp/common/event_error.zul
@@ -1,4 +1,4 @@
-<window title="${i18n:_('Erro ${requestScope['javax.servlet.error.status_code']}')}"
+<window title="${i18n:__('Erro', ${requestScope['javax.servlet.error.status_code']})}"
     width="400px" border="normal" mode="modal"
     apply="org.navalplanner.web.error.PageForErrorOnEvent">
     <vbox>
diff --git a/navalplanner-webapp/src/scripts/gettext_zul.pl b/navalplanner-webapp/src/scripts/gettext_zul.pl
index 40b013343..53f8ebff3 100755
--- a/navalplanner-webapp/src/scripts/gettext_zul.pl
+++ b/navalplanner-webapp/src/scripts/gettext_zul.pl
@@ -32,7 +32,7 @@ use Date::Format;
 
 my $DEBUG = 0;
 my $TOKEN = 'i18n:_';
-my @REG_EXPS = qw(i18n:_\\('(.*?)'\\) <i18n\s.*?value=["'](.*?)["']);
+my @REG_EXPS = qw(i18n:_{1,2}\\('(.*?)'.*?\\) <i18n\s.*?value=["'](.*?)["']);
 my $DEFAULT_KEYS_FILE = "./keys.pot";
 my %ENTRIES;