R: Re: svn commit: r1060599 - in /ofbiz/trunk/applications/accounting: config/AccountingUiLabels.xml src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

R: Re: svn commit: r1060599 - in /ofbiz/trunk/applications/accounting: config/AccountingUiLabels.xml src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java

mrisaliti@libero.it
OK, I will follow.

Did I have to change the commit message for this bug correction ?

Please consider also that a massive work like that can cause same error.

Probably if in the future all the committer do not commit classes that are not
i18n this massive work no more occurs.

Thanks
Marco

>----Messaggio originale----
>Da: [hidden email]
>Data: 19/01/2011 0.26
>A: <[hidden email]>
>Ogg: Re: svn commit: r1060599 - in /ofbiz/trunk/applications/accounting:
config/AccountingUiLabels.xml
src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java

>
>On 01/18/2011 04:30 PM, Jacques Le Roux wrote:
>> Marco,
>>
>> Have you seen Adam's remark about long lines splitted. I guess you are
>> using a tool for format those lines. Anyway we prefer to keep
>> them reasonnably long. At least I agree with Adam we should not
>> uselessly change already long lines
>>
>> Thanks
>>
>> Jacques
>
>Please don't summarize.  Your summary left out a very important
>comment, the fact that the $orderId is no longer being printed in the
>message.
>
>And anyone who is putting commits into ofbiz should be subscribed to
>this list; this list is where buildbot messages are sent, and
>discussions about commits happen.
>
>>
>>> Author: mrisaliti
>>> Date: Tue Jan 18 22:20:48 2011
>>> New Revision: 1060599
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1060599&view=rev
>>> Log:
>>> Internationalization of ServiceUtil.returnSuccess,
>>> ServiceUtil.returnFailure, ServiceUtil.returnError (OFBIZ-4091)
>>>
>>> Modified:
>>> ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
>>>
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.
java
>>>
>>>
>>> Modified:
>>> ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
>>> URL:
>>> http://svn.apache.
org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?
rev=1060599&r1=1060598&r2=1060599&view=diff
>>>
>>>
==============================================================================

>>>
>>> --- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
>>> (original)
>>> +++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
>>> Tue Jan 18 22:20:48 2011
>>> @@ -9470,6 +9470,10 @@
>>> <value xml:lang="en">Exception in calling SagePayPaymentAuthorisation:
>>> ${errorString}</value>
>>> <value xml:lang="it">Eccezione durante la chiamata a
>>> SagePayPaymentAuthorisation: ${errorString}</value>
>>> </property>
>>> + <property key="AccountingSagePayOrderPaymenPreferenceIsNull">
>>> + <value xml:lang="en">OrderPaymentPreference for order : ${orderId }
>>> is null: ${orderPaymentPreference}</value>
>>> + <value xml:lang="it">Preferenze pagamento per l'ordine : ${orderId }
>>> è nullo: ${orderPaymentPreference}</value>
>>> + </property>
>>> <property key="AccountingSagePayPaymentRefundException">
>>> <value xml:lang="en">Exception in calling SagePayPaymentRefund:
>>> ${errorString}</value>
>>> <value xml:lang="it">Eccezione durante la chiamata a
>>> SagePayPaymentRefund: ${errorString}</value>
>>>
>>> Modified:
>>>
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.
java
>>>
>>> URL:
>>> http://svn.apache.
org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.
java?rev=1060599&r1=1060598&r2=1060599&view=diff
>>>
>>>
==============================================================================
>>>
>>> ---
>>>
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.
java
>>> (original)
>>> +++
>>>
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.
java

>>> Tue Jan 18
>>> 22:20:48 2011
>>> @@ -153,11 +153,14 @@ public class SagePayPaymentServices {
>>> Debug.logInfo("SagePay - Entered ccAuth", module);
>>> Debug.logInfo("SagePay ccAuth context : " + context, module);
>>> Map<String, Object> response = null;
>>> + String orderId = (String) context.get("orderId");
>>> Locale locale = (Locale) context.get("locale");
>>> GenericValue orderPaymentPreference = (GenericValue)
>>> context.get("orderPaymentPreference");
>>> +
>>> if (orderPaymentPreference == null) {
>>> response = ServiceUtil.returnError(UtilProperties.getMessage(resource,
>>> - "AccountingProblemGettingOrderPaymentPreferences", locale));
>>> + "AccountingSagePayOrderPaymenPreferenceIsNull",
>>> + UtilMisc.toMap("orderId", orderId, "orderPaymentPreference",
>>> orderPaymentPreference), locale));
>>> } else {
>>> response = processCardAuthorisationPayment(dctx, context);
>>> }
>>>
>>>
>>
>>
>
>