svn commit: r1052038 - in /ofbiz/trunk/specialpurpose: ebaystore/config/ ebaystore/script/org/ofbiz/ebaystore/ ecommerce/config/ ecommerce/script/org/ofbiz/ecommerce/customer/ hhfacility/script/org/ofbiz/hhfacility/ oagis/config/ oagis/script/org/ofbiz...

[mrisaliti]

Author: mrisaliti
Date: Wed Dec 22 19:22:45 2010
New Revision: 1052038

URL: http://svn.apache.org/viewvc?rev=1052038&view=rev
Log:
Replace some fail-message to fail-property tag all specialpurpose components (OFBIZ-1874)

Modified:
    ofbiz/trunk/specialpurpose/ebaystore/config/EbayStoreUiLabels.xml
    ofbiz/trunk/specialpurpose/ebaystore/script/org/ofbiz/ebaystore/EbayServices.xml
    ofbiz/trunk/specialpurpose/ebaystore/script/org/ofbiz/ebaystore/EbayStoreEvents.xml
    ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml
    ofbiz/trunk/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
    ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml
    ofbiz/trunk/specialpurpose/oagis/config/OagisUiLabels.xml
    ofbiz/trunk/specialpurpose/oagis/script/org/ofbiz/oagis/OagisMessageServices.xml
    ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml
    ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml

Modified: ofbiz/trunk/specialpurpose/ebaystore/config/EbayStoreUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/config/EbayStoreUiLabels.xml?rev=1052038&r1=1052037&r2=1052038&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/config/EbayStoreUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/config/EbayStoreUiLabels.xml Wed Dec 22 19:22:45 2010
@@ -36,6 +36,10 @@
         <value xml:lang="en">Export categories to eBay store</value>
         <value xml:lang="th">ส่งออกหมวดหมู่สินค้าเข้าคลังสินค้าในอีเบย์</value>
     </property>
+    <property key="EbayStoreCannotDecreaseQuantity">
+        <value xml:lang="en">Can not decrease quantity of product ${parameters.productId} because it already to used created listing.</value>
+        <value xml:lang="it">Non è possibile diminuire la quantità del prodotto ${parameters.productId} perchè è già usato da aste create.</value>
+    </property>
     <property key="EbayExportToEbayStore">
         <value xml:lang="en">Export To eBay Store</value>
         <value xml:lang="th">การส่งออกไปยังคลังสินค้าอีเบย์</value>

Modified: ofbiz/trunk/specialpurpose/ebaystore/script/org/ofbiz/ebaystore/EbayServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/script/org/ofbiz/ebaystore/EbayServices.xml?rev=1052038&r1=1052037&r2=1052038&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/script/org/ofbiz/ebaystore/EbayServices.xml (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/script/org/ofbiz/ebaystore/EbayServices.xml Wed Dec 22 19:22:45 2010
@@ -53,7 +53,9 @@
             <field-map field-name="productStoreId" from-field="parameters.productStoreId"/>
         </entity-one>
         <if-empty field="productStore">
-            <add-error><fail-message message="No ProductStore found with id ${parameters.productStoreId}, not reserving inventory."/></add-error>
+            <add-error>
+                <fail-property resource="ProductUiLabels" property="ProductProductStoreNotFound"/>
+            </add-error>
             <check-errors/>
         </if-empty>
 
@@ -86,7 +88,9 @@
                 <log level="info" message="ProductStoreService:Facility Found : [${facilityFound}]"/>
             </iterate>
             <if-empty field="facilityFound">
-                <add-error><fail-message message="Facility with id ${parameters.facilityId} is not associated to ProductStore with id ${parameters.productStoreId}, not reserving inventory."/></add-error>
+                <add-error>
+                    <fail-property resource="ProductUiLabels" property="FacilityNoAssociatedWithProcuctStore"/>
+                </add-error>
                 <check-errors/>
             </if-empty>
             <!-- verifly that product was store in facility -->
@@ -95,7 +99,9 @@
                 <field-map from-field="parameters.productId" field-name="productId"/>
             </entity-and>
             <if-empty field="productFacilityList">
-                <add-error><fail-message message="Facility with id ${parameters.facilityId} is not associated to ProductId with id ${parameters.productId}, not reserving inventory."/></add-error>
+                <add-error>
+                    <fail-property resource="ProductUiLabels" property="FacilityNoAssociatedWithProcuctStore"/>
+                </add-error>
                 <check-errors/>
             </if-empty>
 
@@ -191,7 +197,9 @@
             <field-map field-name="productId" from-field="parameters.productId"/>
         </entity-one>
         <if-empty field="ebayProductStoreInventory">
-            <add-error><fail-message message="No Product found with id ${parameters.productId}."/></add-error>
+            <add-error>
+                <fail-property resource="ProductUiLabels" property="ProductNotFindProductId"/>
+            </add-error>
             <check-errors/>
         </if-empty>
         <set field="actionType" from-field="parameters.actionType"/>
@@ -255,7 +263,9 @@
                     </calculate>
                     <store-value value-field="ebayProductStoreInventory"/>
                     <else>
-                        <add-error><fail-message message="can not decrease quantity of product ${parameters.productId} because it already to used created listing."/></add-error>
+                        <add-error>                        
+                            <fail-property resource="ProductUiLabels" property="EbayStoreCannotDecreaseQuantity"/>
+                        </add-error>
                         <return/>
                     </else>
                 </if-compare>

Modified: ofbiz/trunk/specialpurpose/ebaystore/script/org/ofbiz/ebaystore/EbayStoreEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/script/org/ofbiz/ebaystore/EbayStoreEvents.xml?rev=1052038&r1=1052037&r2=1052038&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/script/org/ofbiz/ebaystore/EbayStoreEvents.xml (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/script/org/ofbiz/ebaystore/EbayStoreEvents.xml Wed Dec 22 19:22:45 2010
@@ -31,7 +31,9 @@
             <field-map field-name="productStoreId" from-field="parameters.productStoreId"/>
         </entity-one>
         <if-empty field="productStore">
-            <add-error><fail-message message="No ProductStore found with id ${parameters.productStoreId}."/></add-error>
+            <add-error>
+                <fail-property resource="ProductUiLabels" property="ProductProductStoreNotFound"/>
+            </add-error>
             <check-errors/>
         </if-empty>
         <entity-one entity-name="EbayProductStorePref" value-field="ebayProdStorePref">
@@ -76,7 +78,9 @@
             <field-map field-name="productStoreId" from-field="parameters.productStoreId"/>
         </entity-one>
         <if-empty field="productStore">
-            <add-error><fail-message message="No ProductStore found with id ${parameters.productStoreId}."/></add-error>
+            <add-error>
+                <fail-property resource="ProductUiLabels" property="ProductProductStoreNotFound"/>
+            </add-error>
             <check-errors/>
         </if-empty>
         <entity-one entity-name="EbayProductStorePref" value-field="ebayProdStorePref">
@@ -119,7 +123,9 @@
             <field-map field-name="productStoreId" from-field="parameters.productStoreId"/>
         </entity-one>
         <if-empty field="productStore">
-            <add-error><fail-message message="No ProductStore found with id ${parameters.productStoreId}."/></add-error>
+            <add-error>
+                <fail-property resource="ProductUiLabels" property="ProductProductStoreNotFound"/>
+            </add-error>
             <check-errors/>
         </if-empty>
         <entity-one entity-name="EbayProductStorePref" value-field="ebayProdStorePref">
@@ -161,7 +167,9 @@
             <field-map field-name="productStoreId" from-field="parameters.productStoreId"/>
         </entity-one>
         <if-empty field="productStore">
-            <add-error><fail-message message="No ProductStore found with id ${parameters.productStoreId}."/></add-error>
+            <add-error>
+                <fail-property resource="ProductUiLabels" property="ProductProductStoreNotFound"/>
+            </add-error>
             <check-errors/>
         </if-empty>
 
@@ -202,7 +210,9 @@
             <field-map field-name="productStoreId" from-field="parameters.productStoreId"/>
         </entity-one>
         <if-empty field="productStore">
-            <add-error><fail-message message="No ProductStore found with id ${parameters.productStoreId}."/></add-error>
+            <add-error>
+                <fail-property resource="ProductUiLabels" property="ProductProductStoreNotFound"/>
+            </add-error>
             <check-errors/>
         </if-empty>
 
@@ -292,7 +302,9 @@
             <field-map field-name="productStoreId" from-field="parameters.productStoreId"/>
         </entity-one>
         <if-empty field="productStore">
-            <add-error><fail-message message="No ProductStore found with id ${parameters.productStoreId}."/></add-error>
+            <add-error>
+                <fail-property resource="ProductUiLabels" property="ProductProductStoreNotFound"/>
+            </add-error>
             <check-errors/>
         </if-empty>
 

Modified: ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml?rev=1052038&r1=1052037&r2=1052038&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/config/EcommerceUiLabels.xml Wed Dec 22 19:22:45 2010
@@ -1960,6 +1960,14 @@
         <value xml:lang="zh">月</value>
         <value xml:lang="zh_TW">月</value>
     </property>
+    <property key="EcommerceMonthsAtAddressNotValid">
+        <value xml:lang="en">Months at address not a valid number: ${parameters.monthsAtAddress}</value>
+        <value xml:lang="it">Mesi all'indirizzo non è un numero valido: ${parameters.monthsAtAddress}</value>
+    </property>
+    <property key="EcommerceMonthsWithEmployeeNotValid">
+        <value xml:lang="en">Months with Employer was not a valid number: ${parameters.monthsWithEmployer}</value>
+        <value xml:lang="it">Mesi come impiegato non è un numero valido: ${parameters.monthsWithEmployer}</value>
+    </property>
     <property key="EcommerceMyAccount">
         <value xml:lang="da">Min konto</value>
         <value xml:lang="de">Mein Konto</value>
@@ -3739,6 +3747,14 @@
         <value xml:lang="zh">浏览已发送和已接收</value>
         <value xml:lang="zh_TW">瀏覽已發送</value>
     </property>
+    <property key="EcommerceYearsAtAddressNotValid">
+        <value xml:lang="en">Years at address not a valid number: ${parameters.yearsAtAddress}</value>
+        <value xml:lang="it">Anni all'indirizzo non è un numero valido: ${parameters.yearsAtAddress}</value>
+    </property>
+    <property key="EcommerceYearsWithEmployeeNotValid">
+        <value xml:lang="en">Years with Employer was not a valid number: ${parameters.yearsWithEmployer}</value>
+        <value xml:lang="it">Anni come impiegato non è un numero valido: ${parameters.yearsWithEmployer}</value>
+    </property>
     <property key="EcommerceYouHave">
         <value xml:lang="da">De har</value>
         <value xml:lang="de">Sie haben</value>

Modified: ofbiz/trunk/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml?rev=1052038&r1=1052037&r2=1052038&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml Wed Dec 22 19:22:45 2010
@@ -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
@@ -66,8 +66,7 @@ under the License.
                 <process field="USERNAME"><copy to-field="userLoginId"/><not-empty><fail-property resource="PartyUiLabels" property="PartyUserLoginMissingError"/></not-empty></process>
                 <process field="PASSWORD"><copy to-field="currentPassword"/><not-empty><fail-property resource="PartyUiLabels" property="PartyPasswordMissing"/></not-empty></process>
                 <process field="CONFIRM_PASSWORD">
-                    <compare-field operator="equals" field="PASSWORD"><fail-property resource="PartyUiLabels" property="PartyPasswordMatchError"/></compare-field>
-                    <!-- This is checked below in the checkNewPassword method in the bsh block: <not-empty><fail-message message="You must enter your password twice"/></not-empty> -->
+                    <compare-field operator="equals" field="PASSWORD"><fail-property resource="PartyUiLabels" property="PartyPasswordMatchError"/></compare-field>                    
                     <copy to-field="currentPasswordVerify"/>
                 </process>
                 <process field="PASSWORD_HINT"><copy to-field="passwordHint"/></process>
@@ -540,8 +539,8 @@ under the License.
                 <process field="maritalStatus"><copy/></process>
                 <process field="employmentStatusEnumId"><copy/></process>
                 <process field="occupation"><copy/></process>
-                <process field="yearsWithEmployer"><convert type="Long"><fail-message message="Years with Employer was not a valid number: ${parameters.yearsWithEmployer}"/></convert></process>
-                <process field="monthsWithEmployer"><convert type="Long"><fail-message message="Months with Employer was not a valid number: ${parameters.monthsWithEmployer}"/></convert></process>
+                <process field="yearsWithEmployer"><convert type="Long"><fail-property resource="EcommerceUiLabels" property="EcommerceYearsWithEmployeeNotValid"/></convert></process>
+                <process field="monthsWithEmployer"><convert type="Long"><fail-property resource="EcommerceUiLabels" property="EcommerceMonthsWithEmployeeNotValid"/></convert></process>
                 <process field="existingCustomer"><copy/></process>
             </simple-map-processor>
         </call-map-processor>
@@ -569,7 +568,7 @@ under the License.
                 </process>
                 <process field="homeContactNumber">
                     <copy to-field="contactNumber"/>
-                    <not-empty><fail-message message="Home Phone Contact Number is missing."/></not-empty>
+                    <not-empty><fail-property resource="PartyUiLabels" property="PartyHomePhoneContactNumberMissing"/></not-empty>
                 </process>
                 <process field="homeExt"><copy to-field="extension"/></process>
                 <process field="homeSol"><copy to-field="allowSolicitation"/></process>
@@ -656,7 +655,11 @@ under the License.
         </if-not-empty>
     </simple-method>
     <simple-method method-name="updateCustomer" short-description="Update Customer" login-required="true">
-        <if-empty field="parameters.partyId"><add-error><fail-message message="No partyId passed, cannot Update Customer"/></add-error></if-empty>
+        <if-empty field="parameters.partyId">
+            <add-error>
+                <fail-property resource="PartyUiLabels" property="PartyNoPartyForUpdateCustomer"/>
+            </add-error>
+        </if-empty>
 
         <call-simple-method method-name="validateCustomerInfo"/>
 
@@ -743,8 +746,8 @@ under the License.
                     <not-empty><fail-property resource="PartyUiLabels" property="PartyCountryMissing"/></not-empty>
                 </process>
                 <process field="allowSolicitation"><copy/></process>
-                <process field="yearsAtAddress"><convert type="Long" to-field="yearsWithContactMech"><fail-message message="Years at address not a valid number: ${parameters.yearsAtAddress}"/></convert></process>
-                <process field="monthsAtAddress"><convert type="Long" to-field="monthsWithContactMech"><fail-message message="Months at address not a valid number: ${parameters.monthsAtAddress}"/></convert></process>
+                <process field="yearsAtAddress"><convert type="Long" to-field="yearsWithContactMech"><fail-property resource="EcommerceUiLabels" property="EcommerceYearsAtAddressNotValid"/></convert></process>
+                <process field="monthsAtAddress"><convert type="Long" to-field="monthsWithContactMech"><fail-property resource="EcommerceUiLabels" property="EcommerceMonthsAtAddressNotValid"/></convert></process>
             </simple-map-processor>
         </call-map-processor>
         <if-compare value="USA" operator="equals" field="parameters.countryGeoId">

Modified: ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml?rev=1052038&r1=1052037&r2=1052038&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml (original)
+++ ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml Wed Dec 22 19:22:45 2010
@@ -31,7 +31,9 @@ under the License.
         </if-not-empty>
         <if-empty field="product.productId">
             <log level="info" message="No product found for ID ${parameters.productId}, "/>
-            <add-error error-list-name="errorMessageList"><fail-message message="Product not found"/></add-error>
+            <add-error error-list-name="errorMessageList">
+                <fail-property resource="ProductUiLabels" property="ProductErrorProductNotFound"/>
+            </add-error>
             <return response-code="error"/>  <!-- all done -->
         </if-empty>
     </simple-method>

Modified: ofbiz/trunk/specialpurpose/oagis/config/OagisUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/config/OagisUiLabels.xml?rev=1052038&r1=1052037&r2=1052038&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/config/OagisUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/oagis/config/OagisUiLabels.xml Wed Dec 22 19:22:45 2010
@@ -200,6 +200,10 @@
         <value xml:lang="th">ข้อมูลของข้อความ</value>
         <value xml:lang="zh">消息信息</value>
     </property>
+    <property key="OagisMessageAlreadyReceived">
+        <value xml:lang="en"> This message was already received, ie we have a duplicate combined ID for the message: ${newEntity}</value>
+        <value xml:lang="it"> Questo messaggio è già stato ricevuto, c'è un duplicato ID per il messaggio: ${newEntity}</value>
+    </property>
     <property key="OagisMessageDataFileUpload">
         <value xml:lang="en">Oagis Message DataFile Upload</value>
         <value xml:lang="fr">Téléchargement du message Oagis par fichier de données vers le serveur</value>

Modified: ofbiz/trunk/specialpurpose/oagis/script/org/ofbiz/oagis/OagisMessageServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/script/org/ofbiz/oagis/OagisMessageServices.xml?rev=1052038&r1=1052037&r2=1052038&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/script/org/ofbiz/oagis/OagisMessageServices.xml (original)
+++ ofbiz/trunk/specialpurpose/oagis/script/org/ofbiz/oagis/OagisMessageServices.xml Wed Dec 22 19:22:45 2010
@@ -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
@@ -28,7 +28,9 @@ under the License.
         <!-- make sure it doesn't already exist: motivation: if it already exists we'll get a HUGE error message on the create with the whole XML file in it if debug is on for that, so we want a smaller error message -->
         <find-by-primary-key map="newEntity" value-field="currentOagisMessageInfo"/>
         <if-not-empty field="currentOagisMessageInfo">
-            <add-error><fail-message message="This message was already received, ie we have a duplicate combined ID for the message: ${newEntity}"/></add-error>
+            <add-error>
+                <fail-property resource="OagisUiLabels" property="OagisMessageAlreadyReceived"/>
+            </add-error>
             <check-errors/>
         </if-not-empty>
 

Modified: ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml?rev=1052038&r1=1052037&r2=1052038&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml Wed Dec 22 19:22:45 2010
@@ -794,6 +794,14 @@
         <value xml:lang="th">Billing</value>
         <value xml:lang="zh">账单</value>
     </property>
+    <property key="ProjectMgrCannotAddToTimesheet">
+        <value xml:lang="en">Cannot add to timesheet ${timesheet.timesheetId} because the status does not allow additions or modifications.</value>
+        <value xml:lang="it">Non è possibile aggiungerlo alla timbratura ${timesheet.timesheetId} perchè lo stato non permette aggiunte o modifiche.</value>
+    </property>
+    <property key="ProjectMgrCannotAddInvoiceToTimesheet">
+        <value xml:lang="en">Invoice with ID ${parameters.invoiceId}, has the wrong status, not adding Timesheet Entries to it.</value>
+        <value xml:lang="it">Fattura con ID ${parameters.invoiceId}, ha lo stato errato, non aggiungerlo alla riga timbratura.</value>
+    </property>
     <property key="ProjectMgrCheckComplete">
         <value xml:lang="de">Markieren wenn Fertiggestellt</value>
         <value xml:lang="en">Check Complete</value>
@@ -954,6 +962,10 @@
         <value xml:lang="th">แก้ไขงาน</value>
         <value xml:lang="zh">编辑任务</value>
     </property>
+    <property key="ProjectMgrErrorProjectNotFound">
+        <value xml:lang="en">Project: ${parameters.projectId} not found</value>
+        <value xml:lang="it">Progetto: ${parameters.projectId} non trovato</value>
+    </property>
     <property key="ProjectMgrErrorRequestNotFound">
         <value xml:lang="de">Kundenanfrage: ${parameters.custRequestId} wurde nicht gefunden</value>
         <value xml:lang="en">Customer Request: ${parameters.custRequestId} not found</value>
@@ -1192,6 +1204,10 @@
         <value xml:lang="th">สร้างใหม่</value>
         <value xml:lang="zh">创建新的</value>
     </property>
+    <property key="ProjectMgrNoTimeentryItemsFound">
+        <value xml:lang="en">No timeentry items found</value>
+        <value xml:lang="it">Nessuna riga timbratura trovata</value>
+    </property>
     <property key="ProjectMgrParentProjectName">
         <value xml:lang="de">Name des übergeordneten Projektes</value>
         <value xml:lang="en">Parent Project Name</value>

Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml?rev=1052038&r1=1052037&r2=1052038&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Wed Dec 22 19:22:45 2010
@@ -612,7 +612,9 @@
 
         <if-empty field="project">
             <field-to-result field="parameters.projectId" result-name="projectId"/>
-            <add-error error-list-name="error_list"><fail-message message="Project: ${parameters.projectId} not found"/></add-error>
+            <add-error error-list-name="error_list">
+                <fail-property resource="ProjectMgrUiLabels" property="ProjectMgrErrorProjectNotFound"/>
+            </add-error>
         </if-empty>
         <if-empty field="parameters.workEffortName">
             <set field="parameters.workEffortName" from-field="project.workEffortName"/>
@@ -1178,7 +1180,7 @@
                         <set field="parameters.timesheetId" from-field="timesheet.timesheetId"/>
                         <else>
                             <add-error>
-                                <fail-message message="Cannot add to timesheet ${timesheet.timesheetId} because the status does not allow additions or modifications."/>
+                                <fail-property resource="ProjectMgrUiLabels" property="ProjectMgrCannotAddToTimesheet"/>
                             </add-error>
                             <check-errors/>
                         </else>
@@ -1209,20 +1211,24 @@
         <if-compare operator="equals" value="Y" field="parameters.reCreate">
             <entity-one entity-name="Invoice" value-field="invoice"/>
             <if-empty field="invoice">
-                <add-error><fail-message message="Could not find invoice with ID [${parameters.invoiceId}], not adding Timesheet Entries to it."/></add-error>
+                <add-error>
+                    <fail-property resource="WorkEffortUiLabels" property="WorkEffortTimesheetCannotFindInvoice"/>
+                </add-error>
                 <check-errors/>
             </if-empty>
             <if-compare field="invoice.statusId" operator="not-equals" value="INVOICE_IN_PROCESS">
-                <add-error><fail-message message="Invoice with ID [${parameters.invoiceId}], has the wrong status, not adding Timesheet Entries to it."/></add-error>
+                <add-error>
+                    <fail-property resource="ProjectMgrUiLabels" property="ProjectMgrCannotAddInvoiceToTimesheet"/>
+                </add-error>
                 <check-errors/>
             </if-compare>
             <entity-and list="entries" entity-name="TimeEntry">
                 <field-map field-name="invoiceId" from-field="parameters.invoiceId"/>
             </entity-and>
             <iterate list="entries" entry="timeEntry">
-                   <clear-field field="timeEntry.invoiceId"/>
-                   <clear-field field="timeEntry.invoiceItemSeqId"/>
-                   <store-value value-field="timeEntry"/>
+                <clear-field field="timeEntry.invoiceId"/>
+                <clear-field field="timeEntry.invoiceItemSeqId"/>
+                <store-value value-field="timeEntry"/>
             </iterate>
             <set field="removeItems.invoiceId" from-field="parameters.invoiceId"/>
             <remove-by-and entity-name="InvoiceItem" map="removeItems"/>
@@ -1239,7 +1245,7 @@
         </entity-condition>
         <if-empty field="tasks">
             <add-error>
-                <fail-message message="No timeentry items found"/>
+                <fail-property resource="ProjectMgrUiLabels" property="ProjectMgrNoTimeentryItemsFound"/>
             </add-error>
             <check-errors/>
         </if-empty>