svn commit: r1348805 - in /ofbiz/trunk/applications/product: config/ProductUiLabels.xml src/org/ofbiz/product/promo/PromoServices.java

[erwan]

Author: erwan
Date: Mon Jun 11 11:42:37 2012
New Revision: 1348805

URL: http://svn.apache.org/viewvc?rev=1348805&view=rev
Log:
Using labels for product promo codes creation

Modified:
    ofbiz/trunk/applications/product/config/ProductUiLabels.xml
    
ofbiz/trunk/applications/product/src/org/ofbiz/product/promo/PromoServices.java

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=1348805&r1=1348804&r2=1348805&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Mon Jun 11 
11:42:37 2012
@@ -21805,6 +21805,10 @@
         <value xml:lang="zh">促销/优惠券代码</value>
         <value xml:lang="zh_TW">促銷/優惠券代碼</value>
     </property>
+    <property key="ProductPromoCodesCreated">
+        <value xml:lang="en">Following PromoCodes have been created: </value>
+        <value xml:lang="fr">Les codes promo suivants ont été créés : 
</value>
+    </property>
     <property key="ProductPromoCodesEntered">
         <value xml:lang="de">Eingegebene Codes:</value>
         <value xml:lang="en">Entered Codes:</value>

Modified: 
ofbiz/trunk/applications/product/src/org/ofbiz/product/promo/PromoServices.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/promo/PromoServices.java?rev=1348805&r1=1348804&r2=1348805&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/product/src/org/ofbiz/product/promo/PromoServices.java 
(original)
+++ 
ofbiz/trunk/applications/product/src/org/ofbiz/product/promo/PromoServices.java 
Mon Jun 11 11:42:37 2012
@@ -60,6 +60,7 @@ public class PromoServices {
             'Z', '2', '3', '4', '5', '6', '7', '8', '9' };
 
     public static Map<String, Object> 
createProductPromoCodeSet(DispatchContext dctx, Map<String, ? extends Object> 
context) {
+        Locale locale = (Locale) context.get("locale");
         Delegator delegator = dctx.getDelegator();
         LocalDispatcher dispatcher = dctx.getDispatcher();
         Long quantity = (Long) context.get("quantity");
@@ -77,7 +78,7 @@ public class PromoServices {
 
         String newPromoCodeId = "";
         StringBuilder bankOfNumbers = new StringBuilder();
-        bankOfNumbers.append("Following PromoCodes have been created: ");
+        bankOfNumbers.append(UtilProperties.getMessage(resource, 
"ProductPromoCodesCreated", locale));
         for (long i = 0; i < quantity; i++) {
             Map<String, Object> createProductPromoCodeMap = null;
             boolean foundUniqueNewCode = false;
@@ -110,11 +111,11 @@ public class PromoServices {
                 newContext.put("productPromoCodeId", newPromoCodeId);
                 createProductPromoCodeMap = 
dispatcher.runSync("createProductPromoCode", newContext);
             } catch (GenericServiceException err) {
-                return ServiceUtil.returnError("Could not create a bank of 
promo codes", null, null, createProductPromoCodeMap);
+                return 
ServiceUtil.returnError(UtilProperties.getMessage(resource, 
"ProductPromoCodeCannotBeCreated", locale), null, null, 
createProductPromoCodeMap);
             }
             if (ServiceUtil.isError(createProductPromoCodeMap)) {
                 // what to do here? try again?
-                return ServiceUtil.returnError("Could not create a bank of 
promo codes", null, null, createProductPromoCodeMap);
+                return 
ServiceUtil.returnError(UtilProperties.getMessage(resource, 
"ProductPromoCodeCannotBeCreated", locale), null, null, 
createProductPromoCodeMap);
             }
             bankOfNumbers.append((String) 
createProductPromoCodeMap.get("productPromoCodeId"));
             bankOfNumbers.append(",");