Author: mrisaliti
Date: Tue Jan 25 21:00:03 2011
New Revision: 1063459
URL: http://svn.apache.org/viewvc?rev=1063459&view=rev
Log:
Internationalization of java services for ebay component and remove a java
compile warning (OFBIZ-4091)
Modified:
ofbiz/trunk/specialpurpose/ebay/config/EbayUiLabels.xml
ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java
ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java
Modified: ofbiz/trunk/specialpurpose/ebay/config/EbayUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/config/EbayUiLabels.xml?rev=1063459&r1=1063458&r2=1063459&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/config/EbayUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/config/EbayUiLabels.xml Tue Jan 25 21:00:03
2011
@@ -97,6 +97,10 @@
<value xml:lang="en">Shipping Method Configurations</value>
<value xml:lang="it">Configurazioni metodi di spedizione</value>
</property>
+ <property key="EbayUnableToCreatePostalAddress">
+ <value xml:lang="en">Unable to create postalAddress with input map:
</value>
+ <value xml:lang="it">Non è possibile create l'indirizzo postal con
l'input: </value>
+ </property>
<property key="EbayViewPermissionError">
<value xml:lang="en">You do not have permission to view this page.
("EBAY_VIEW" needed)</value>
<value xml:lang="fr">Vous n'avez pas la permission de voir cette page.
(Il faut l'autorisation "EBAY_VIEW")</value>
Modified:
ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java?rev=1063459&r1=1063458&r2=1063459&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java
(original)
+++ ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java
Tue Jan 25 21:00:03 2011
@@ -1119,9 +1119,9 @@ public class EbayOrderServices {
EbayHelper.correctCityStateCountry(dispatcher,
shippingAddressCtx, city, state, country);
List<GenericValue> shipInfo =
- PartyWorker.findMatchingPersonPostalAddresses
- (delegator,
-
shippingAddressCtx.get("shippingAddressStreet1").toString(),
+ PartyWorker.findMatchingPersonPostalAddresses
+ (delegator,
+
shippingAddressCtx.get("shippingAddressStreet1").toString(),
(UtilValidate.isEmpty(shippingAddressCtx.get("shippingAddressStreet2")) ? null
: shippingAddressCtx.get("shippingAddressStreet2").toString()),
shippingAddressCtx.get("city").toString(),
(UtilValidate.isEmpty(shippingAddressCtx.get("stateProvinceGeoId")) ? null :
shippingAddressCtx.get("stateProvinceGeoId").toString()),
@@ -1180,7 +1180,7 @@ public class EbayOrderServices {
Debug.logInfo("Creating new postal address for party: " +
partyId, module);
contactMechId = EbayHelper.createAddress(dispatcher,
partyId, userLogin, "SHIPPING_LOCATION", shippingAddressCtx);
if (UtilValidate.isEmpty(contactMechId)) {
- return ServiceUtil.returnFailure("Unable to create
postalAddress with input map: " + shippingAddressCtx);
+ return
ServiceUtil.returnFailure(UtilProperties.getMessage(resource,
"EbayStoreUnableToCreatePostalAddress", locale) + shippingAddressCtx);
}
Debug.logInfo("Created postal address: " + contactMechId,
module);
Debug.logInfo("Creating new phone number for party: " +
partyId, module);
@@ -1280,7 +1280,7 @@ public class EbayOrderServices {
// Checking if previously added same product exists in the cart
ShoppingCartItem previouslyAddedItemInCart = null;
if (cart.size() != 0) {
- Iterator cartiter = cart.iterator();
+ Iterator<ShoppingCartItem> cartiter = cart.iterator();
while (cartiter != null && cartiter.hasNext()) {
ShoppingCartItem cartItem = (ShoppingCartItem) cartiter.next();
if (cartItem.getProductId().equals(productId)) {
Modified:
ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java?rev=1063459&r1=1063458&r2=1063459&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java
(original)
+++
ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java
Tue Jan 25 21:00:03 2011
@@ -760,7 +760,7 @@ public class ImportOrdersFromEbay {
Debug.logInfo("Creating new postal address for party: " +
partyId, module);
contactMechId = EbayHelper.createAddress(dispatcher,
partyId, userLogin, "SHIPPING_LOCATION", parameters);
if (UtilValidate.isEmpty(contactMechId)) {
- return ServiceUtil.returnFailure("Unable to create
postalAddress with input map: " + parameters);
+ return
ServiceUtil.returnFailure(UtilProperties.getMessage(resource,
"EbayUnableToCreatePostalAddress", locale) + parameters);
}
Debug.logInfo("Created postal address: " + contactMechId,
module);
Debug.logInfo("Creating new phone number for party: " +
partyId, module);
