svn commit: r321148 - in /cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/generation: JXMacrosHelper.java jx-macros.xml

[gi...@apache.org]

Author: giacomo
Date: Fri Oct 14 09:49:09 2005
New Revision: 321148

URL: http://svn.apache.org/viewcvs?rev=321148&view=rev
Log:
make sure the Form object has a chance to initially get the correct locale

Modified:
    cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/generation/JXMacrosHelper.java
    cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/generation/jx-macros.xml

Modified: cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/generation/JXMacrosHelper.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/generation/JXMacrosHelper.java?rev=321148&r1=321147&r2=321148&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/generation/JXMacrosHelper.java (original)
+++ cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/generation/JXMacrosHelper.java Fri Oct 14 09:49:09 2005
@@ -33,6 +33,7 @@
 import org.apache.cocoon.forms.formmodel.tree.Tree;
 import org.apache.cocoon.forms.formmodel.tree.TreeWalker;
 import org.apache.cocoon.forms.validation.ValidationError;
+import org.apache.cocoon.i18n.I18nUtils;
 import org.apache.cocoon.xml.AbstractXMLPipe;
 import org.apache.cocoon.xml.AttributesImpl;
 import org.apache.cocoon.xml.XMLConsumer;
@@ -52,6 +53,7 @@
 
     private XMLConsumer cocoonConsumer;
     private Request request;
+    private Locale locale;
     private ArrayStack widgetStack = new ArrayStack();
     private ArrayStack pipeStack = new ArrayStack();
     private Map classes; // lazily created
@@ -66,13 +68,14 @@
      * @param consumer the generator's consumer
      * @return a helper object
      */
-    public static JXMacrosHelper createHelper(XMLConsumer consumer, Request request) {
-        return new JXMacrosHelper(consumer, request);
+    public static JXMacrosHelper createHelper(XMLConsumer consumer, Request request, String locale) {
+        return new JXMacrosHelper(consumer, request, locale);
     }
 
-    public JXMacrosHelper(XMLConsumer consumer, Request request) {
+    public JXMacrosHelper(XMLConsumer consumer, Request request, String locale) {
         this.cocoonConsumer = consumer;
         this.request = request;
+        this.locale = I18nUtils.parseLocale(locale);
         this.ajaxRequest = request.getParameter("cocoon-ajax") != null;
     }
 
@@ -285,7 +288,7 @@
         // Needs to be buffered
         RootBufferingPipe pipe = new RootBufferingPipe(this.cocoonConsumer, arguments);
         this.pipeStack.push(pipe);
-        widget.generateSaxFragment(pipe, null);
+        widget.generateSaxFragment(pipe, this.locale);
     }
 
     /**

Modified: cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/generation/jx-macros.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/generation/jx-macros.xml?rev=321148&r1=321147&r2=321148&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/generation/jx-macros.xml (original)
+++ cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/generation/jx-macros.xml Fri Oct 14 09:49:09 2005
@@ -25,7 +25,7 @@
         ft:form-template
     -->
     <jx:macro name="form-template" targetNamespace="http://apache.org/cocoon/forms/1.0#template">
-      <jx:set var="cformsHelper" value="#{org.apache.cocoon.forms.generation.JXMacrosHelper.createHelper($cocoon/consumer,$cocoon/request)}"/>
+      <jx:set var="cformsHelper" value="#{org.apache.cocoon.forms.generation.JXMacrosHelper.createHelper($cocoon/consumer,$cocoon/request,$cocoon/parameters/locale)}"/>
       <jx:set var="form" value="${cformsHelper.getForm(CocoonFormsInstance, cocoon.parameters['attribute-name'])}"/>
       <jx:if test="${cformsHelper.isVisible(form)}">
         <jx:set var="cformsDummy" value="${cformsHelper.startForm(form, macro.arguments)}"/>