svn commit: r1814934 - /ofbiz/ofbiz-framework/trunk/applications/product/config/ProductPromoUiLabels.xml

[jleroux]

Author: jleroux
Date: Sat Nov 11 10:15:23 2017
New Revision: 1814934

URL: http://svn.apache.org/viewvc?rev=1814934&view=rev
Log:
Fixed: Duplicated dollar symbols should be removed from uiLabels.
(OFBIZ-9968)

For example: In 'ProductPromoUiLabels.xml' file 
'ProductPromoCondition.PPIP_PRODUCT_TOTAL', 
'ProductPromoCondition.PPIP_PRODUCT_AMOUNT' etc. 
uilabels contain duplicated dollar symbols 

Thanks: Sonal Patwari

Modified:
    
ofbiz/ofbiz-framework/trunk/applications/product/config/ProductPromoUiLabels.xml

Modified: 
ofbiz/ofbiz-framework/trunk/applications/product/config/ProductPromoUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/config/ProductPromoUiLabels.xml?rev=1814934&r1=1814933&r2=1814934&view=diff
==============================================================================
--- 
ofbiz/ofbiz-framework/trunk/applications/product/config/ProductPromoUiLabels.xml
 (original)
+++ 
ofbiz/ofbiz-framework/trunk/applications/product/config/ProductPromoUiLabels.xml
 Sat Nov 11 10:15:23 2017
@@ -77,9 +77,9 @@
         <value xml:lang="zh-TW">大于等于</value>
     </property>
     <property key="ProductPromoCondition.PPIP_ORDER_TOTAL">
-        <value xml:lang="en">spend ${quantityOperator} $${condValue}</value>
-        <value xml:lang="zh">花费 ${quantityOperator} $${condValue}</value>
-        <value xml:lang="zh-TW">花費 ${quantityOperator} 
$${condValue}</value>
+        <value xml:lang="en">spend ${quantityOperator} ${condValue}</value>
+        <value xml:lang="zh">花费 ${quantityOperator} ${condValue}</value>
+        <value xml:lang="zh-TW">花費 ${quantityOperator} ${condValue}</value>
     </property>
     <property key="ProductPromoCondition.PPIP_PARTY_CLASS.APPLIED">
         <value xml:lang="en">Applied to party classification - 
${partyClassificationsIncluded}</value>
@@ -88,14 +88,14 @@
         <value xml:lang="en">Not applied to party classification - 
${partyClassificationsExcluded}</value>
     </property>
     <property key="ProductPromoCondition.PPIP_PRODUCT_TOTAL">
-        <value xml:lang="en">buy ${quantityOperator} $${condValue} of 
qualifying products</value>
-        <value xml:lang="zh">è´­ä¹° ${quantityOperator} $${condValue} 的合æ 
¼äº§å“</value>
-        <value xml:lang="zh-TW">購買 ${quantityOperator} $${condValue} 
的合格產品</value>
+        <value xml:lang="en">buy ${quantityOperator} ${condValue} of 
qualifying products</value>
+        <value xml:lang="zh">è´­ä¹° ${quantityOperator} ${condValue} 的合æ 
¼äº§å“</value>
+        <value xml:lang="zh-TW">購買 ${quantityOperator} ${condValue} 
的合格產品</value>
     </property>
     <property key="ProductPromoCondition.PPIP_PRODUCT_AMOUNT">
-        <value xml:lang="en">for each $${condValue} or more of qualifying 
products</value>
-        <value xml:lang="zh">对于每个 $${condValue} 或更多的合æ 
¼äº§å“</value>
-        <value xml:lang="zh-TW">對于每個 $${condValue} 或更多的合æ 
¼ç”¢å“</value>
+        <value xml:lang="en">for each ${condValue} or more of qualifying 
products</value>
+        <value xml:lang="zh">对于每个 ${condValue} 或更多的合æ 
¼äº§å“</value>
+        <value xml:lang="zh-TW">對于每個 ${condValue} 或更多的合æ 
¼ç”¢å“</value>
     </property>
     <property key="ProductPromoCondition.PPIP_PRODUCT_QUANT">
         <value xml:lang="en">buy ${condValue} of qualifying products</value>
@@ -138,14 +138,14 @@
         <value xml:lang="zh-TW">得到 ${quantity} 按折扣 ${amount}%</value>
     </property>
     <property key="ProductPromoAction.PROMO_PROD_AMDISC">
-        <value xml:lang="en">get ${quantity} at $${amount} off</value>
-        <value xml:lang="zh">得到 ${quantity} 按 $${amount} 扣除</value>
-        <value xml:lang="zh-TW">得到 ${quantity} 按 $${amount} 
扣除</value>
+        <value xml:lang="en">get ${quantity} at ${amount} off</value>
+        <value xml:lang="zh">得到 ${quantity} 按 ${amount} 扣除</value>
+        <value xml:lang="zh-TW">得到 ${quantity} 按 ${amount} 扣除</value>
     </property>
     <property key="ProductPromoAction.PROMO_PROD_PRICE">
-        <value xml:lang="en">get ${quantity} for $${amount}</value>
-        <value xml:lang="zh">得到 ${quantity} 按 $${amount} 计算</value>
-        <value xml:lang="zh-TW">得到 ${quantity} 按 $${amount} 
計算</value>
+        <value xml:lang="en">get ${quantity} for ${amount}</value>
+        <value xml:lang="zh">得到 ${quantity} 按 ${amount} 计算</value>
+        <value xml:lang="zh-TW">得到 ${quantity} 按 ${amount} 計算</value>
     </property>
     <property key="ProductPromoAction.PROMO_ORDER_PERCENT">
         <value xml:lang="en">get ${amount}% off your order</value>
@@ -153,8 +153,8 @@
         <value xml:lang="zh-TW">得到 ${amount}% 從你的訂單扣除</value>
     </property>
     <property key="ProductPromoAction.PROMO_ORDER_AMOUNT">
-        <value xml:lang="en">get $${amount} off your order</value>
-        <value xml:lang="zh">得到 $${amount} 从你的订单扣除</value>
-        <value xml:lang="zh-TW">得到 $${amount} 從你的訂單扣除</value>
+        <value xml:lang="en">get ${amount} off your order</value>
+        <value xml:lang="zh">得到 ${amount} 从你的订单扣除</value>
+        <value xml:lang="zh-TW">得到 ${amount} 從你的訂單扣除</value>
     </property>
 </resource>
\ No newline at end of file