From 3cd17ed7a118bfc470ec13b947b98e97bf461d02 Mon Sep 17 00:00:00 2001
From: lmann99 <lmann@linuxolutions.com>
Date: Sun, 22 Jan 2017 20:50:17 -0500
Subject: [PATCH] Modify taglib config to correct /WEB-INF/tld/i18n.tld not
 found errors

Copy i18n.tld to same location as config.xml and update config.xml to point at new location.

Fixes #11
---
 .../main/resources/metainfo/tld/config.xml    |  2 +-
 .../src/main/resources/metainfo/tld/i18n.tld  | 26 +++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 libreplan-webapp/src/main/resources/metainfo/tld/i18n.tld

diff --git a/libreplan-webapp/src/main/resources/metainfo/tld/config.xml b/libreplan-webapp/src/main/resources/metainfo/tld/config.xml
index d38abf1cf..b098b2380 100644
--- a/libreplan-webapp/src/main/resources/metainfo/tld/config.xml
+++ b/libreplan-webapp/src/main/resources/metainfo/tld/config.xml
@@ -2,6 +2,6 @@
     <config-name>i18n</config-name>
     <taglib>
         <taglib-uri>http://org.libreplan.web/i18n</taglib-uri>
-        <taglib-location>libreplan-webapp/WEB-INF/tld/i18n.tld</taglib-location>
+        <taglib-location>/metainfo/tld/i18n.tld</taglib-location>
     </taglib>
 </config>
\ No newline at end of file
diff --git a/libreplan-webapp/src/main/resources/metainfo/tld/i18n.tld b/libreplan-webapp/src/main/resources/metainfo/tld/i18n.tld
new file mode 100644
index 000000000..8995a7ceb
--- /dev/null
+++ b/libreplan-webapp/src/main/resources/metainfo/tld/i18n.tld
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<taglib>
+    <uri>http://org.libreplan.web/i18n</uri>
+    <description>
+    </description>
+    <function>
+        <name>_</name>
+        <function-class>org.libreplan.web.I18nHelper</function-class>
+        <function-signature>
+            java.lang.String _(java.lang.String name)
+        </function-signature>
+        <description>
+        </description>
+    </function>
+
+    <!-- Pass one extra argument -->
+    <function>
+        <name>__</name>
+        <function-class>org.libreplan.web.I18nHelper</function-class>
+        <function-signature>
+            java.lang.String _(java.lang.String name, java.lang.Object arg0)
+        </function-signature>
+        <description>
+        </description>
+    </function>
+</taglib>