svn commit: r1085322 - in /ofbiz/trunk/applications/order: config/OrderUiLabels.xml webapp/ordermgr/entry/cart/showcartitems.ftl

[erwan]

Author: erwan
Date: Fri Mar 25 11:16:44 2011
New Revision: 1085322

URL: http://svn.apache.org/viewvc?rev=1085322&view=rev
Log:
Missing uiLabels in showcartitems.ftl

Modified:
    ofbiz/trunk/applications/order/config/OrderUiLabels.xml
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl

Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=1085322&r1=1085321&r2=1085322&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Fri Mar 25 11:16:44 2011
@@ -1858,6 +1858,7 @@
     </property>
     <property key="OrderAssociatedProducts">
         <value xml:lang="en">Associated Products</value>
+        <value xml:lang="fr">Produits associés</value>
         <value xml:lang="pt_BR">Produtos relacionado</value>
         <value xml:lang="zh_TW">關連的產品</value>
     </property>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl?rev=1085322&r1=1085321&r2=1085322&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl Fri Mar 25 11:16:44 2011
@@ -216,7 +216,7 @@ under the License.
             <#if itemProductAssocList?exists && itemProductAssocList?has_content>
               <tr><td colspan="8"><hr /></td></tr>
               <tr>
-                <td>${uiLabelMap.AssociatedProducts}</td>
+                <td>${uiLabelMap.OrderAssociatedProducts}</td>
                 <td><a href="<@ofbizUrl>LookupAssociatedProducts?productId=${cartLine.getProductId()?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderQuickLookup}</a></td>
               </tr>
               <#assign relatedProdCount = 0/>
@@ -308,7 +308,7 @@ under the License.
               <tr>
                 <td colspan="4" nowrap="nowrap" align="right">
                   <div>
-                    <i>Adjustment</i> - ${adjustmentType.get("description",locale)?if_exists}
+                    <i>${uiLabelMap.OrderAdjustment}</i> - ${adjustmentType.get("description",locale)?if_exists}
                     <#if cartAdjustment.productPromoId?has_content><a href="<@ofbizUrl>showPromotionDetails?productPromoId=${cartAdjustment.productPromoId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDetails}</a></#if>:
                   </div>
                 </td>