[OFBiz] SVN: r7338 - in trunk/applications/order/webapp/ordermgr: entry/cart order

[jacopo@svn.ofbiz.org]

Author: jacopo
Date: 2006-04-19 01:22:58 -0500 (Wed, 19 Apr 2006)
New Revision: 7338

Modified:
   trunk/applications/order/webapp/ordermgr/entry/cart/promoUseDetailsInline.ftl
   trunk/applications/order/webapp/ordermgr/order/orderlist.ftl
Log:
i18n changes from Marco Risaliti (OFBIZ-823).

Modified: trunk/applications/order/webapp/ordermgr/entry/cart/promoUseDetailsInline.ftl
===================================================================
--- trunk/applications/order/webapp/ordermgr/entry/cart/promoUseDetailsInline.ftl	2006-04-19 06:14:40 UTC (rev 7337)
+++ trunk/applications/order/webapp/ordermgr/entry/cart/promoUseDetailsInline.ftl	2006-04-19 06:22:58 UTC (rev 7338)
@@ -36,7 +36,7 @@
                     <#-- TODO: when promo pretty print is done show promo short description here -->
                        ${uiLabelMap.EcommercePromotion} <a href="<@ofbizUrl>showPromotionDetails?productPromoId=${productPromoUseInfo.productPromoId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDetails}</a>
                     <#if productPromoUseInfo.productPromoCodeId?has_content> - with Code [${productPromoUseInfo.productPromoCodeId}]</#if>
-                    <#if (productPromoUseInfo.totalDiscountAmount != 0)> - Total Value <@ofbizCurrency amount=(-1*productPromoUseInfo.totalDiscountAmount) isoCode=shoppingCart.getCurrency()/></#if>
+                    <#if (productPromoUseInfo.totalDiscountAmount != 0)> - ${uiLabelMap.CommonTotal} <@ofbizCurrency amount=(-1*productPromoUseInfo.totalDiscountAmount) isoCode=shoppingCart.getCurrency()/></#if>
                 </div>
                 <#if (productPromoUseInfo.quantityLeftInActions > 0)>
                     <div class="tabletext">- Could be used for ${productPromoUseInfo.quantityLeftInActions} more discounted item<#if (productPromoUseInfo.quantityLeftInActions > 1)>s</#if> if added to your cart.</div>

Modified: trunk/applications/order/webapp/ordermgr/order/orderlist.ftl
===================================================================
--- trunk/applications/order/webapp/ordermgr/order/orderlist.ftl	2006-04-19 06:14:40 UTC (rev 7337)
+++ trunk/applications/order/webapp/ordermgr/order/orderlist.ftl	2006-04-19 06:22:58 UTC (rev 7338)
@@ -26,7 +26,7 @@
       <form method="post" name="findorder" action="<@ofbizUrl>orderlist</@ofbizUrl>">
         <table border="0" cellspacing="0" cellpadding="0" class="boxbottom">
           <tr>
-            <td><div class="tableheadtext">Status:</div></td>
+            <td><div class="tableheadtext">${uiLabelMap.CommonStatus}:</div></td>
             <td>&nbsp;&nbsp;</td>
             <td nowrap>
                 <div class="tabletext">
@@ -46,7 +46,7 @@
             </td>
           </tr>
           <tr>
-            <td><div class="tableheadtext">Type:</div></td>
+            <td><div class="tableheadtext">${uiLabelMap.CommonType}:</div></td>
             <td>&nbsp;&nbsp;</td>
             <td nowrap>
                 <div class="tabletext">