svn commit: r1814936 - in /ofbiz/branches/release16.11: ./ applications/product/config/Pr
Locked
svn commit: r1814936 - in /ofbiz/branches/release16.11: ./ applications/product/config/Pr
 
|
Author: jleroux
Date: Sat Nov 11 10:16:05 2017 New Revision: 1814936 URL: http://svn.apache.org/viewvc?rev=1814936&view=rev Log: "Applied fix from trunk framework for revision: 1814934" ------------------------------------------------------------------------ r1814934 | jleroux | 2017-11-11 11:15:23 +0100 (sam., 11 nov. 2017) | 9 lines 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/branches/release16.11/ (props changed) ofbiz/branches/release16.11/applications/product/config/ProductPromoUiLabels.xml Propchange: ofbiz/branches/release16.11/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Nov 11 10:16:05 2017 @@ -10,5 +10,5 @@ /ofbiz/branches/json-integration-refactoring:1634077-1635900 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 -/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814501,1814591,1814642,1814644,1814709,1814873,1814928 +/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814501,1814591,1814642,1814644,1814709,1814873,1814928,1814934 /ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979,1782498,1782520 Modified: ofbiz/branches/release16.11/applications/product/config/ProductPromoUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/product/config/ProductPromoUiLabels.xml?rev=1814936&r1=1814935&r2=1814936&view=diff ============================================================================== --- ofbiz/branches/release16.11/applications/product/config/ProductPromoUiLabels.xml (original) +++ ofbiz/branches/release16.11/applications/product/config/ProductPromoUiLabels.xml Sat Nov 11 10:16:05 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 |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |