Author: paulfoxworthy
Date: Mon Mar 25 12:46:16 2013
New Revision: 1460637
URL: http://svn.apache.org/r1460637
Log:
Add grams to Product Shipment Uom labels (Jira OFBIZ-5154)
Modified:
ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/ideal/IdealEvents.java
ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml
ofbiz/trunk/applications/product/config/ProductUiLabels.xml
ofbiz/trunk/framework/common/src/org/ofbiz/common/email/NotificationServices.java
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelEntityChecker.java
ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayBestOfferAutoPref.java
ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayFeedback.java
Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=1460637&r1=1460636&r2=1460637&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Mon Mar
25 12:46:16 2013
@@ -13666,9 +13666,9 @@
<value xml:lang="vi">SỠphụ</value>
<value xml:lang="zh">æç»å类账</value>
</property>
- <property key="AccountingSuccessFull">
+ <property key="AccountingSuccessful">
<value xml:lang="ar">ÙاجØ</value>
- <value xml:lang="en">successfull</value>
+ <value xml:lang="en">successful</value>
<value xml:lang="es">exitoso</value>
<value xml:lang="fr">réussi</value>
<value xml:lang="hi_IN">सफल</value>
@@ -21613,8 +21613,8 @@
<value xml:lang="vi">Thanh toán nháºn qua iDEAL</value>
<value xml:lang="zh">éè¿iDEALæ¥æ¶å°çæ¯ä»</value>
</property>
- <property key="IdealSuccessFull">
- <value xml:lang="en">The transaction has been successfull.</value>
+ <property key="IdealSuccessful">
+ <value xml:lang="en">The transaction has been successful.</value>
<value xml:lang="fr">La transaction a été réussie.</value>
<value
xml:lang="ja">ãã©ã³ã¶ã¯ã·ã§ã³ã¯æåãã¾ããã</value>
<value xml:lang="nl">De betaling is met succes ontvangen.</value>
Modified:
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java?rev=1460637&r1=1460636&r2=1460637&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
(original)
+++
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
Mon Mar 25 12:46:16 2013
@@ -3215,7 +3215,7 @@ public class InvoiceServices {
*/
private static Map<String, Object> storePaymentApplication(Delegator
delegator, GenericValue paymentApplication,Locale locale) {
Map<String, Object> results =
ServiceUtil.returnSuccess(UtilProperties.getMessage(resource,
- "AccountingSuccessFull", locale));
+ "AccountingSuccessful", locale));
boolean debug = true;
if (debug) Debug.logInfo("Start updating the paymentApplication table
", module);
Modified:
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/ideal/IdealEvents.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/ideal/IdealEvents.java?rev=1460637&r1=1460636&r2=1460637&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/ideal/IdealEvents.java
(original)
+++
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/ideal/IdealEvents.java
Mon Mar 25 12:46:16 2013
@@ -293,7 +293,7 @@ public class IdealEvents {
}
}
if (okay) {
- request.setAttribute("_EVENT_MESSAGE_",
UtilProperties.getMessage(resource, "IdealSuccessFull", locale));
+ request.setAttribute("_EVENT_MESSAGE_",
UtilProperties.getMessage(resource, "IdealSuccessful", locale));
// attempt to release the offline hold on the order (workflow)
OrderChangeHelper.releaseInitialOrderHold(dispatcher, orderId);
// call the email confirm service
Modified:
ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml?rev=1460637&r1=1460636&r2=1460637&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml
(original)
+++ ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml Mon
Mar 25 12:46:16 2013
@@ -4441,7 +4441,7 @@
</property>
<property key="ManufacturingRoutingTaskAssocCreateSuccessfully">
<value xml:lang="de">Arbeitsgang-Zuordnung erfolgreich erstellt</value>
- <value xml:lang="en">Routing Task association creation
successfull</value>
+ <value xml:lang="en">Routing Task association creation
successful</value>
<value xml:lang="es">Creación de asociación de tareas exitosa</value>
<value xml:lang="fr">Association de l'opération à la gamme
réussie</value>
<value xml:lang="it">Operazione associazione creata con
successo</value>
@@ -4455,7 +4455,7 @@
</property>
<property key="ManufacturingRoutingTaskCopiedSuccessfully">
<value xml:lang="de">Arbeitsgang erfolgreich kopiert</value>
- <value xml:lang="en">Routing Task copied Successfully</value>
+ <value xml:lang="en">Routing Task copied successfully</value>
<value xml:lang="es">Tarea copiada exitosamente</value>
<value xml:lang="fr">Opération copiée avec succés</value>
<value xml:lang="it">Operazione copiata con successo</value>
Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=1460637&r1=1460636&r2=1460637&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Mon Mar 25
12:46:16 2013
@@ -27874,6 +27874,14 @@
<value xml:lang="vi">trong</value>
<value xml:lang="zh">è±å¯¸</value>
</property>
+ <property key="ProductShipmentUomAbbreviation_WT_g">
+ <value xml:lang="de">g</value>
+ <value xml:lang="en">g</value>
+ <value xml:lang="es">g</value>
+ <value xml:lang="fr">g</value>
+ <value xml:lang="it">g</value>
+ <value xml:lang="ja">g</value>
+ </property>
<property key="ProductShipmentUomAbbreviation_WT_kg">
<value xml:lang="de">kg</value>
<value xml:lang="en">kg</value>
Modified:
ofbiz/trunk/framework/common/src/org/ofbiz/common/email/NotificationServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/email/NotificationServices.java?rev=1460637&r1=1460636&r2=1460637&view=diff
==============================================================================
---
ofbiz/trunk/framework/common/src/org/ofbiz/common/email/NotificationServices.java
(original)
+++
ofbiz/trunk/framework/common/src/org/ofbiz/common/email/NotificationServices.java
Mon Mar 25 12:46:16 2013
@@ -177,7 +177,7 @@ public class NotificationServices {
* the message body of the notification.
* <p>
* The result returned will contain the appropriate response
- * messages indicating succes or failure and the OUT parameter,
+ * messages indicating success or failure and the OUT parameter,
* "body" containing the generated message.
*
* @param ctx The dispatching context of the service
@@ -217,7 +217,7 @@ public class NotificationServices {
// extract the newly created body for the notification email
String notificationBody = writer.toString();
- // generate the successfull reponse
+ // generate the successful response
result =
ServiceUtil.returnSuccess(UtilProperties.getMessage(resource,
"CommonNotifyEmailMessageBodyGeneratedSuccessfully", locale));
result.put("body", notificationBody);
} catch (IOException ie) {
Modified:
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelEntityChecker.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelEntityChecker.java?rev=1460637&r1=1460636&r2=1460637&view=diff
==============================================================================
---
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelEntityChecker.java
(original)
+++
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelEntityChecker.java
Mon Mar 25 12:46:16 2013
@@ -284,7 +284,7 @@ public class ModelEntityChecker {
}
public static final String[] rwArray = { "ABORT", "ABS", "ABSOLUTE",
- "ACCEPT", "ACCES", "ACS", "ACTION", "ACTIVATE", "ADD", "ADDFORM",
+ "ACCEPT", "ACCES", "ACCESS", "ACS", "ACTION", "ACTIVATE", "ADD",
"ADDFORM",
"ADMIN", "AFTER", "AGGREGATE", "ALIAS", "ALL", "ALLOCATE", "ALTER",
"ANALYZE", "AND", "ANDFILENAME", "ANY", "ANYFINISH", "APPEND",
"ARCHIVE", "ARE", "ARRAY", "AS", "ASC", "ASCENDING", "ASCII",
@@ -472,7 +472,7 @@ public class ModelEntityChecker {
"START_TRANSACTION", "STATE", "STATIC", "STATISTICS", "STATUS",
"STDDEV", "STDEV", "STEP", "STOP", "STORE", "STRAIGHT_JOIN",
"STRING", "STRUCTURE", "SUBMENU", "SUBSTR", "SUBSTRING", "SUBTYPE",
- "SUCCEEDS", "SUCCESFULL", "SUCCESSFULL", "SUM", "SUMU", "SUPERDBA",
+ "SUCCEEDS", "SUCCESFULL", "SUCCESSFULL", "SUCCESSFUL", "SUM",
"SUMU", "SUPERDBA",
"SYB_TERMINATE", "SYNONYM", "SYSDATE", "SYSSORT", "SYSTEM_USER",
"TABLE", "TABLEDATA", "TABLES", "TEMP", "TEMPORARY", "TERMINATE",
Modified:
ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayBestOfferAutoPref.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayBestOfferAutoPref.java?rev=1460637&r1=1460636&r2=1460637&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayBestOfferAutoPref.java
(original)
+++
ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayBestOfferAutoPref.java
Mon Mar 25 12:46:16 2013
@@ -196,7 +196,7 @@ public class EbayBestOfferAutoPref {
result = ServiceUtil.returnError(errorMessage);
return result;
}
- String successMsg = "Store best offer to entity Successfull.";
+ String successMsg = "Store best offer to entity successful.";
result = ServiceUtil.returnSuccess(successMsg);
return result;
}
Modified:
ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayFeedback.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayFeedback.java?rev=1460637&r1=1460636&r2=1460637&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayFeedback.java
(original)
+++
ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayFeedback.java
Mon Mar 25 12:46:16 2013
@@ -197,7 +197,7 @@ public class EbayFeedback {
// TODO Auto-generated catch block
e.printStackTrace();
}
- String successMsg = "Load eBay Feedback Successfull.";
+ String successMsg = "Load eBay Feedback successful.";
result = ServiceUtil.returnSuccess(successMsg);
return result;
}
