svn commit: r1744560 - in /ofbiz/branches/release15.12: applications/order/config/OrderUiLabels.xml applications/order/webapp/ordermgr/entry/cart/promotiondetails.ftl specialpurpose/ecommerce/config/EcommerceUiLabels.xml

[pranayp]

Author: pranayp
Date: Thu May 19 12:24:29 2016
New Revision: 1744560

URL: http://svn.apache.org/viewvc?rev=1744560&view=rev
Log:
[OFBIZ-7057] Applied fix from trunk for r1742712  Fixed UiLabel for the GeneratedDescription in ordermgr after applying promotion which was missing due to the usage from EcommerceUiLabels. Thanks Swapnil M Mane for reporting this issue and providing patch for the same.

Modified:
    ofbiz/branches/release15.12/applications/order/config/OrderUiLabels.xml
    ofbiz/branches/release15.12/applications/order/webapp/ordermgr/entry/cart/promotiondetails.ftl
    ofbiz/branches/release15.12/specialpurpose/ecommerce/config/EcommerceUiLabels.xml

Modified: ofbiz/branches/release15.12/applications/order/config/OrderUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/order/config/OrderUiLabels.xml?rev=1744560&r1=1744559&r2=1744560&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/branches/release15.12/applications/order/config/OrderUiLabels.xml Thu May 19 12:24:29 2016
@@ -4809,6 +4809,18 @@
         <value xml:lang="zh">从周一到周二</value>
         <value xml:lang="zh-TW">從週一至四</value>
     </property>
+    <property key="OrderGeneratedDescription">
+        <value xml:lang="da">Generel beskrivelse:</value>
+        <value xml:lang="en">Generated Description:</value>
+        <value xml:lang="fr">Description générée : </value>
+        <value xml:lang="it">Descrizione generata:</value>
+        <value xml:lang="ja">生成された詳細:</value>
+        <value xml:lang="nl">Gegenereerde beschrijving:</value>
+        <value xml:lang="pt-BR">Descrição geral</value>
+        <value xml:lang="vi">Miêu tả được tạo ra:</value>
+        <value xml:lang="zh">生成的描述：</value>
+        <value xml:lang="zh-TW">產生的說明:</value>
+    </property>
     <property key="OrderGift">
         <value xml:lang="ar">هدية</value>
         <value xml:lang="cs">Dárek</value>

Modified: ofbiz/branches/release15.12/applications/order/webapp/ordermgr/entry/cart/promotiondetails.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/order/webapp/ordermgr/entry/cart/promotiondetails.ftl?rev=1744560&r1=1744559&r2=1744560&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/order/webapp/ordermgr/entry/cart/promotiondetails.ftl (original)
+++ ofbiz/branches/release15.12/applications/order/webapp/ordermgr/entry/cart/promotiondetails.ftl Thu May 19 12:24:29 2016
@@ -23,6 +23,6 @@ under the License.
     </div>
     <div class="screenlet-body">
         <div>${StringUtil.wrapString(productPromo.promoText!)}</div>
-        <div>${uiLabelMap.EcommerceGeneratedDescription}  ${promoAutoDescription!}</div>
+        <div>${uiLabelMap.OrderGeneratedDescription} ${promoAutoDescription!}</div>
     </div>
 </div>

Modified: ofbiz/branches/release15.12/specialpurpose/ecommerce/config/EcommerceUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/ecommerce/config/EcommerceUiLabels.xml?rev=1744560&r1=1744559&r2=1744560&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/ecommerce/config/EcommerceUiLabels.xml (original)
+++ ofbiz/branches/release15.12/specialpurpose/ecommerce/config/EcommerceUiLabels.xml Thu May 19 12:24:29 2016
@@ -1298,18 +1298,6 @@
         <value xml:lang="zh">来自站点：</value>
         <value xml:lang="zh-TW">來自站台:</value>
     </property>
-    <property key="EcommerceGeneratedDescription">
-        <value xml:lang="da">Generel beskrivelse:</value>
-        <value xml:lang="en">Generated Description:</value>
-        <value xml:lang="fr">Description générée : </value>
-        <value xml:lang="it">Descrizione generata:</value>
-        <value xml:lang="ja">生成された詳細:</value>
-        <value xml:lang="nl">Gegenereerde beschrijving:</value>
-        <value xml:lang="pt-BR">Descrição geral</value>
-        <value xml:lang="vi">Miêu tả được tạo ra:</value>
-        <value xml:lang="zh">生成的描述：</value>
-        <value xml:lang="zh-TW">產生的說明:</value>
-    </property>
     <property key="EcommerceGiftAmount">
         <value xml:lang="da">Gavebeløb:</value>
         <value xml:lang="de">Gutschein Betrag:</value>