svn commit: r902810 - in /ofbiz/trunk/applications/accounting: config/AccountingUiLabels.xml src/org/ofbiz/accounting/payment/PaymentMethodServices.java

Author: jleroux
Date: Mon Jan 25 13:50:01 2010
New Revision: 902810

URL: http://svn.apache.org/viewvc?rev=902810&view=rev
Log:
A patch from Sascha Rodekamp "PaymentMethodServices - Get return value from the uiLabels" (https://issues.apache.org/jira/browse/OFBIZ-3423) - OFBIZ-3423

A few return messages were defined as fixed end string messages, this commit changes them to uiLabel messages.



Modified:
    ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
    ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=902810&r1=902809&r2=902810&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Mon Jan 25 13:50:01 2010
@@ -13984,4 +13984,12 @@
         <value xml:lang="en">Could not update credit card (write failure) : </value>
         <value xml:lang="it">Non è possibile aggiornare la carta di credito (fallimento in scrittura) : </value>
     </property>
+    <property key="NoChangesMadeNotUpdatingCreditCard">
+        <value xml:lang="de">Keine Änderungen, Keditkarteninformationen werden nicht aktualisiert</value>
+        <value xml:lang="en">No changes made, not updating credit card</value>
+    </property>
+    <property key="NoChangesMadeNotUpdatingEftAccount">
+        <value xml:lang="de">Keine Änderungen, EFT Account wurde nicht aktualisiert</value>
+        <value xml:lang="en">No changes made, not updating EFT Account</value>
+    </property>
 </resource>
\ No newline at end of file

Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java?rev=902810&r1=902809&r2=902810&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java Mon Jan 25 13:50:01 2010
@@ -412,7 +412,7 @@
             result.put("oldPaymentMethodId", paymentMethodId);
             result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS);
             if (contactMechId == null || !contactMechId.equals("_NEW_")) {
-                result.put(ModelService.SUCCESS_MESSAGE, "No changes made, not updating credit card");
+                result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage(resource, "NoChangesMadeNotUpdatingCreditCard", locale));
             }
 
             return result;
@@ -524,6 +524,7 @@
         Delegator delegator = ctx.getDelegator();
         Security security = ctx.getSecurity();
         GenericValue userLogin = (GenericValue) context.get("userLogin");
+        Locale locale = (Locale) context.get("locale");
 
         Timestamp now = UtilDateTime.nowTimestamp();
 
@@ -627,7 +628,7 @@
             result.put("paymentMethodId", paymentMethodId);
             result.put("oldPaymentMethodId", paymentMethodId);
             result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS);
-            result.put(ModelService.SUCCESS_MESSAGE, "No changes made, not updating EFT Account");
+            result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage(resource, "NoChangesMadeNotUpdatingEftAccount", locale));
 
             return result;
         }
@@ -742,6 +743,7 @@
         Delegator delegator = ctx.getDelegator();
         Security security = ctx.getSecurity();
         GenericValue userLogin = (GenericValue) context.get("userLogin");
+        Locale locale = (Locale) context.get("locale");
 
         Timestamp now = UtilDateTime.nowTimestamp();
 
@@ -851,7 +853,7 @@
             result.put("paymentMethodId", paymentMethodId);
             result.put("oldPaymentMethodId", paymentMethodId);
             result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS);
-            result.put(ModelService.SUCCESS_MESSAGE, "No changes made, not updating EFT Account");
+            result.put(ModelService.SUCCESS_MESSAGE, UtilProperties.getMessage(resource, "NoChangesMadeNotUpdatingEftAccount", locale));
 
             return result;
         }