svn commit: r813672 - in /ofbiz/trunk: applications/order/config/OrderUiLabels.xml specialpurpose/ecommerce/widget/EmailOrderScreens.xml

Author: jleroux
Date: Fri Sep 11 06:25:39 2009
New Revision: 813672

URL: http://svn.apache.org/viewvc?rev=813672&view=rev
Log:
A patch from Eric DE MAULDE "Translation error into OrderConfirmNotice screen" (https://issues.apache.org/jira/browse/OFBIZ-2925) - OFBIZ-2925
When OrderConfirmNotice screen call OrderNoticeEmail.ftl orderheader.ftl has some uiLabelMap variable without source to translate
+ a space in OrderUiLabels.xml

Modified:
    ofbiz/trunk/applications/order/config/OrderUiLabels.xml
    ofbiz/trunk/specialpurpose/ecommerce/widget/EmailOrderScreens.xml

Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=813672&r1=813671&r2=813672&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Fri Sep 11 06:25:39 2009
@@ -8194,7 +8194,7 @@
     <property key="OrderSalesTaxIncluded">
         <value xml:lang="en">Of which Sales Tax included</value>
         <value xml:lang="en_GB">Of which VAT included</value>
-        <value xml:lang="fr">Dont TVA incluse</value>
+        <value xml:lang="fr">Dont TVA incluse </value>
         <value xml:lang="ja">Of which Sales Tax included</value>
     </property>
     <property key="OrderSave">

Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/EmailOrderScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/EmailOrderScreens.xml?rev=813672&r1=813671&r2=813672&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/EmailOrderScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/EmailOrderScreens.xml Fri Sep 11 06:25:39 2009
@@ -79,8 +79,10 @@
     <screen name="OrderConfirmNotice">
         <section>
             <actions>
+                <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="title" value="${uiLabelMap.PageTitleOrderConfirmationNotice}"/>
                 <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/>
                 <set field="allowAnonymousView" value="Y"/>  <!-- this field will instruction OrderStatus.groovy to allow an anonymous order to be viewed by anybody, so the email confirmation screen will work -->