svn commit: r1050871 - in /ofbiz/trunk/applications/commonext: config/SetupUiLabels.xml script/org/ofbiz/setup/SetupEvents.xml

[mrisaliti]

Author: mrisaliti
Date: Sun Dec 19 15:05:57 2010
New Revision: 1050871

URL: http://svn.apache.org/viewvc?rev=1050871&view=rev
Log:
Replace some fail-message to fail-property tag in commonext component (OFBIZ-1874)

Modified:
    ofbiz/trunk/applications/commonext/config/SetupUiLabels.xml
    ofbiz/trunk/applications/commonext/script/org/ofbiz/setup/SetupEvents.xml

Modified: ofbiz/trunk/applications/commonext/config/SetupUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/config/SetupUiLabels.xml?rev=1050871&r1=1050870&r2=1050871&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/config/SetupUiLabels.xml (original)
+++ ofbiz/trunk/applications/commonext/config/SetupUiLabels.xml Sun Dec 19 15:05:57 2010
@@ -79,6 +79,10 @@
         <value xml:lang="it">Stabilimento</value>
         <value xml:lang="zh_TW">場所</value>
     </property>
+    <property key="SetupFacilityNameIsMissing">
+        <value xml:lang="en">Facility Name is missing</value>
+        <value xml:lang="it">Stabilimento mancante</value>
+    </property>
     <property key="SetupOrganizationPartyId">
         <value xml:lang="en">Organization Party Id</value>
         <value xml:lang="it">Soggetto organizzazione</value>
@@ -89,6 +93,10 @@
         <value xml:lang="it">Nome organizzazione</value>
         <value xml:lang="zh_TW">組織名稱</value>
     </property>
+    <property key="SetupOrganizationNameIsMissing">
+        <value xml:lang="en">Organization name is missing</value>
+        <value xml:lang="it">Nome organizzazione è mancante</value>
+    </property>
     <property key="SetupOrganizationInformation">
         <value xml:lang="en">Organization Information</value>
         <value xml:lang="it">Informazioni organizzazione</value>
@@ -104,6 +112,10 @@
         <value xml:lang="it">Nome negozio prodotti</value>
         <value xml:lang="zh_TW">產品商店名稱</value>
     </property>
+    <property key="SetupProductStoreNameIsMissing">
+        <value xml:lang="en">Store Name is missing</value>
+        <value xml:lang="it">Nome negozio è mancante</value>
+    </property>
     <property key="SetupResults">
         <value xml:lang="en">Results</value>
         <value xml:lang="it">Risultati</value>

Modified: ofbiz/trunk/applications/commonext/script/org/ofbiz/setup/SetupEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/script/org/ofbiz/setup/SetupEvents.xml?rev=1050871&r1=1050870&r2=1050871&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/script/org/ofbiz/setup/SetupEvents.xml (original)
+++ ofbiz/trunk/applications/commonext/script/org/ofbiz/setup/SetupEvents.xml Sun Dec 19 15:05:57 2010
@@ -35,7 +35,7 @@
         <call-map-processor in-map-name="parameters" out-map-name="partyGroupContext">
             <simple-map-processor name="newPartyGroup">
                 <process field="partyId"><copy/></process>
-                <process field="groupName"><copy to-field="groupName"/><not-empty><fail-message message="Organization name is missing"/></not-empty></process>
+                <process field="groupName"><copy to-field="groupName"/><not-empty><fail-property resource="" property="SetupOrganizationNameIsMissing"/></not-empty></process>
             </simple-map-processor>
         </call-map-processor>
 
@@ -342,7 +342,9 @@
 
     <simple-method method-name="createFacilityAndContactMech" short-description="create Facility and ContactMech">
         <if-empty field="parameters.facilityName">
-            <add-error><fail-message message="Facility Name is missing"/></add-error>
+            <add-error>
+                <fail-property resource="SetupUiLabels" property="SetupFacilityNameIsMissing"/>
+            </add-error>
         </if-empty>
         <check-errors/>
         
@@ -392,7 +394,9 @@
 
     <simple-method method-name="createProductStoreWithDefaultSetting" short-description="create ProductStore and setting default value for payment and shipping">
         <if-empty field="parameters.storeName">
-            <add-error><fail-message message="Store Name is missing"/></add-error>
+            <add-error>
+                <fail-property resource="SetupUiLabels" property="SetupProductStoreNameIsMissing"/>
+            </add-error>
         </if-empty>
         <if-compare field="parameters.showPricesWithVatTax" operator="equals" value="Y">
             <if-empty field="parameters.vatTaxAuthGeoId">