Author: mrisaliti
Date: Sat Dec 26 21:21:05 2009
New Revision: 894020
URL: http://svn.apache.org/viewvc?rev=894020&view=rev
Log:
I18n of an error/success messages of shipment services
Modified:
ofbiz/trunk/applications/product/config/ProductUiLabels.xml
ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=894020&r1=894019&r2=894020&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Sat Dec 26
21:21:05 2009
@@ -404,6 +404,30 @@
<value xml:lang="en">Shipment Gateway Config Types</value>
<value xml:lang="it">Tipi configurazione gateway spedizione</value>
</property>
+ <property key="FacilityShipmentIdCreated">
+ <value xml:lang="en">Created shipment with ID {0} for ship group ID
{1} for facility ID {2}</value>
+ <value xml:lang="it">Creata spedizione numero {0} per il gruppo
spedizione {1} per lo stabilimento {2}</value>
+ </property>
+ <property key="FacilityShipmentMissingProductStore">
+ <value xml:lang="en">No ProductStore associated with order; cannot use
Quick Ship</value>
+ <value xml:lang="it">Nessun negozio associato all'ordine; non â®
possibile effetuare la spedizione veloce</value>
+ </property>
+ <property key="FacilityShipmentNotCreated">
+ <value xml:lang="en">Warning: no shipments created; could not find
anything ready and needing to be shipped.</value>
+ <value xml:lang="it">Attenzione: nessuna spedizione creata; non â®
possibile trovare niente di pronto da spedire.</value>
+ </property>
+ <property key="FacilityShipmentNotCreatedForNotReserveInventory">
+ <value xml:lang="en">ProductStore {0} does not reserve inventory;
cannot use Quick Ship for Multiple Facilities</value>
+ <value xml:lang="it">Negozio {0} non riserva inventario; non â®
possibile utilizzare la spedizione veloce per stabilimenti multipli</value>
+ </property>
+ <property key="FacilityShipmentNotCreatedForExplodesOrderItems">
+ <value xml:lang="en">ProductStore {0} explodes order items; cannot use
Quick Ship for Multiple Facilities</value>
+ <value xml:lang="it">Negozio {0} esplosione righe ordine; non â®
possibile utilizzare la spedizione veloce per stabilimenti multipli</value>
+ </property>
+ <property key="FacilityShipmentNoItemsAvailableToShip">
+ <value xml:lang="en">No items available to ship at this time for ship
group ID {0}</value>
+ <value xml:lang="it">Nessuna riga disponibile da spedire in questo
momento per il gruppo spedizione {0}</value>
+ </property>
<property key="FacilityShipmentServiceName">
<value xml:lang="en">Shipment Service Name (deprecated use)</value>
<value xml:lang="it">Nome servizio spedizione (uso deprecato)</value>
Modified:
ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml?rev=894020&r1=894019&r2=894020&view=diff
==============================================================================
---
ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
(original)
+++
ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
Sat Dec 26 21:21:05 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -1344,7 +1344,7 @@
<entity-one entity-name="OrderHeader" value-field="orderHeader"/>
<if-empty field="orderHeader.productStoreId">
<!-- no store cannot use quick ship; throw error -->
- <add-error><fail-message message="No ProductStore associated with
order; cannot use Quick Ship"/></add-error>
+ <add-error><fail-property resource="ProductUiLabels"
property="FacilityShipmentMissingProductStore"/></add-error>
<check-errors/>
</if-empty>
@@ -1355,11 +1355,15 @@
<if-compare field="productStore.reserveInventory"
operator="not-equals" value="Y">
<!-- no reservations; no shipment; cannot use quick ship -->
- <add-error><fail-message message="ProductStore
[${productStore.productStoreId}] does not reserve inventory; cannot use Quick
Ship for Multiple Facilities"/></add-error>
+ <set field="argListNames[]"
from-field="productStore.productStoreId"/>
+ <property-to-field
property="FacilityShipmentNotCreatedForNotReserveInventory"
resource="ProductUiLabels" field="errMsg" arg-list-name="argListNames"/>
+ <add-error><fail-message message="${errMsg}"/></add-error>
</if-compare>
<if-compare field="productStore.explodeOrderItems" operator="equals"
value="Y">
<!-- can't insert duplicate rows in shipmentPackageContent -->
- <add-error><fail-message message="ProductStore
[${productStore.productStoreId}] explodes order items; cannot use Quick Ship
for Multiple Facilities"/></add-error>
+ <set field="argListNames[]"
from-field="productStore.productStoreId"/>
+ <property-to-field
property="FacilityShipmentNotCreatedForExplodesOrderItems"
resource="ProductUiLabels" field="errMsg" arg-list-name="argListNames"/>
+ <add-error><fail-message message="${errMsg}"/></add-error>
</if-compare>
<check-errors/>
@@ -1396,7 +1400,7 @@
<field-to-result field="successMessageList"/>
<if-empty field="shipmentShipGroupFacilityList">
- <add-error><fail-message message="Warning: no shipments created;
could not find anything ready and needing to be shipped."/></add-error>
+ <add-error><fail-property resource="ProductUiLabels"
property="FacilityShipmentNotCreated"/></add-error>
</if-empty>
<check-errors/>
</simple-method>
@@ -1498,7 +1502,8 @@
<!-- make sure we have something to ship -->
<if-empty field="perShipGroupItemList">
- <string-to-list string="No items available to ship at this
time for ship group ID [${orderItemShipGroup.shipGroupSeqId}]"
list="successMessageList"/>
+ <set field="argListNames[]"
from-field="orderItemShipGroup.shipGroupSeqId"/>
+ <property-to-field
property="FacilityShipmentNoItemsAvailableToShip" resource="ProductUiLabels"
field="successMessage" arg-list-name="argListNames"/>
<else>
<!-- create the shipment for this facility and ship group
combination -->
<set from-field="orderHeader.orderId"
field="shipmentContext.primaryOrderId"/>
@@ -1627,7 +1632,10 @@
<set from-field="facility.facilityId"
field="shipmentShipGroupFacility.facilityId"/>
<set from-field="orderItemShipGroup.shipGroupSeqId"
field="shipmentShipGroupFacility.shipGroupSeqId"/>
<field-to-list field="shipmentShipGroupFacility"
list="shipmentShipGroupFacilityList"/>
- <string-to-list string="Created shipment with ID
[${shipmentShipGroupFacility.shipmentId}] for ship group ID
[${shipmentShipGroupFacility.shipGroupSeqId}] for facility ID
[${shipmentShipGroupFacility.facilityId}]" list="successMessageList"/>
+ <set field="argListNames[]"
from-field="shipmentShipGroupFacility.shipmentId"/>
+ <set field="argListNames[]"
from-field="shipmentShipGroupFacility.shipGroupSeqId"/>
+ <set field="argListNames[]"
from-field="shipmentShipGroupFacility.facilityId"/>
+ <property-to-field property="FacilityShipmentIdCreated"
resource="ProductUiLabels" field="successMessage" arg-list-name="argListNames"/>
<clear-field field="shipmentShipGroupFacility"/>
</else>
</if-empty>
