[Yanel-commits] rev 27952 - public/yanel/trunk/src/contributions/resources/contact-form/src/java/org/wyona/yanel/impl/resources

[simon at wyona.com]

Author: simon
Date: 2007-10-08 15:42:59 +0200 (Mon, 08 Oct 2007)
New Revision: 27952

Modified:
   public/yanel/trunk/src/contributions/resources/contact-form/src/java/org/wyona/yanel/impl/resources/ContactResource.java
Log:
see bug#5590 thanks to josias!

Modified: public/yanel/trunk/src/contributions/resources/contact-form/src/java/org/wyona/yanel/impl/resources/ContactResource.java
===================================================================
--- public/yanel/trunk/src/contributions/resources/contact-form/src/java/org/wyona/yanel/impl/resources/ContactResource.java	2007-10-05 16:30:10 UTC (rev 27951)
+++ public/yanel/trunk/src/contributions/resources/contact-form/src/java/org/wyona/yanel/impl/resources/ContactResource.java	2007-10-08 13:42:59 UTC (rev 27952)
@@ -163,10 +163,6 @@
                 if (request.getParameter("message") != null) transformer.setParameter("message", request.getParameter("message"));
             }
             
-            // create first i18n transformer:
-            I18nTransformer2 i18nTransformer1 = new I18nTransformer2(messageBundle, language, getRealm().getDefaultLanguage());
-            i18nTransformer1.setEntityResolver(catalogResolver);
-            
             // create xslt transformer for global layout
             TransformerHandler xsltHandler2 = tf.newTransformerHandler(getGlobalXSLTStreamSource(path));
             transformer = xsltHandler2.getTransformer();
@@ -180,21 +176,24 @@
             ResourceResolver resolver = new ResourceResolver(this);
             xIncludeTransformer.setResolver(resolver);
             
-            // create second i18n transformer:
-            I18nTransformer2 i18nTransformer2 = new I18nTransformer2("global", language, getRealm().getDefaultLanguage());
-            i18nTransformer2.setEntityResolver(catalogResolver);
+            // create i18n transformer:
+            String[] messageBundles = new String[2];
+            messageBundles[0] = messageBundle;
+            messageBundles[1] = "global";
             
+            I18nTransformer2 i18nTransformer = new I18nTransformer2(messageBundles, language, getRealm().getDefaultLanguage());
+            i18nTransformer.setEntityResolver(catalogResolver);
+            
             // create serializer:
             Serializer serializer = SerializerFactory.getSerializer(SerializerFactory.XHTML_STRICT);
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
 
             // chain everything together (create a pipeline):
             xmlReader.setContentHandler(xsltHandler1);
-            xsltHandler1.setResult(new SAXResult(i18nTransformer1));
-            i18nTransformer1.setResult(new SAXResult(xsltHandler2));
+            xsltHandler1.setResult(new SAXResult(xsltHandler2));
             xsltHandler2.setResult(new SAXResult(xIncludeTransformer));
-            xIncludeTransformer.setResult(new SAXResult(i18nTransformer2));
-            i18nTransformer2.setResult(new SAXResult(serializer.asContentHandler()));
+            xIncludeTransformer.setResult(new SAXResult(i18nTransformer));
+            i18nTransformer.setResult(new SAXResult(serializer.asContentHandler()));
             serializer.setOutputStream(baos);
             
             // execute pipeline: