You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2008/03/15 16:03:36 UTC
svn commit: r637423 - in /ofbiz/trunk/applications/order:
config/OrderUiLabels.xml src/org/ofbiz/order/order/OrderServices.java
Author: jleroux
Date: Sat Mar 15 08:03:31 2008
New Revision: 637423
URL: http://svn.apache.org/viewvc?rev=637423&view=rev
Log:
I18n for note "Added item to order:"
Modified:
ofbiz/trunk/applications/order/config/OrderUiLabels.xml
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=637423&r1=637422&r2=637423&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Sat Mar 15 08:03:31 2008
@@ -198,10 +198,15 @@
<value xml:lang="es">Sufijo en tarjeta</value>
<value xml:lang="th">à¸à¸³à¸¥à¸à¸à¹à¸²à¸¢à¸à¸±à¸à¸£</value>
</property>
- <property key="CommonRegistred">
- <value xml:lang="en">Registred</value>
- <value xml:lang="es">Usuario registrado</value>
- <value xml:lang="th">ลà¸à¸à¸°à¹à¸à¸µà¸¢à¸</value>
+ <property key="AccountingSuffixCard">
+ <value xml:lang="de">Suffix auf der Karte</value>
+ <value xml:lang="en">Suffix Card</value>
+ <value xml:lang="es">Sufijo en tarjeta</value>
+ <value xml:lang="th">à¸à¸³à¸¥à¸à¸à¹à¸²à¸¢à¸à¸±à¸à¸£</value>
+ </property>
+ <property key="AddedItemToOrder">
+ <value xml:lang="en">Added item to order: </value>
+ <value xml:lang="fr">Article ajouté à la commande : </value>
</property>
<property key="EcommerceANew">
<value xml:lang="en">a new</value>
Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=637423&r1=637422&r2=637423&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java Sat Mar 15 08:03:31 2008
@@ -627,7 +627,7 @@
// and connect them with the orderitem over the WorkOrderItemFulfillment
// create also the techData calendars to keep track of availability of the fixed asset.
if (workEfforts != null && workEfforts.size() > 0) {
- List tempList = new LinkedList();
+ List tempList = new LinkedList();
Iterator we = workEfforts.iterator();
while (we.hasNext()) {
// create the entity maps required.
@@ -713,7 +713,7 @@
if (techDataCalendarExcDay == null) {
Iterator tdcedi = tempList.iterator();
while (tdcedi.hasNext()) {
- GenericValue currentValue = (GenericValue) tdcedi.next();
+ GenericValue currentValue = (GenericValue) tdcedi.next();
if ("TechDataCalendarExcDay".equals(currentValue.getEntityName()) && currentValue.getString("calendarId").equals(fixedAsset.getString("calendarId"))
&& currentValue.getTimestamp("exceptionDateStartTime").equals(exceptionDateStartTime)) {
techDataCalendarExcDay = currentValue;
@@ -3143,7 +3143,8 @@
// log an order note
try {
- dispatcher.runSync("createOrderNote", UtilMisc.<String, Object>toMap("orderId", orderId, "note", "Added item to order: " +
+ String addedItemToOrder = UtilProperties.getMessage(resource, "AddedItemToOrder", locale);
+ dispatcher.runSync("createOrderNote", UtilMisc.<String, Object>toMap("orderId", orderId, "note", addedItemToOrder +
productId + " (" + quantity + ")", "internalNote", "Y", "userLogin", userLogin));
} catch (GenericServiceException e) {
Debug.logError(e, module);