svn commit: r1183423 - in /ofbiz/trunk: applications/humanres/script/org/ofbiz/humanres/HumanResEvents.xml framework/common/config/CommonUiLabels.xml specialpurpose/scrum/script/org/ofbiz/scrum/ScrumEvents.xml

Author: jleroux
Date: Fri Oct 14 16:59:16 2011
New Revision: 1183423

URL: http://svn.apache.org/viewvc?rev=1183423&view=rev
Log:
Replaces 3 hardcoded sentences in <default-message> introduced at (r1170129, r1142915) since r1132726. Few remains... asking Hans...

Introduces also 2 new labels that will be used soon with commit for WIP OFBIZ-3913 (External Devices by Nicolas)

Modified:
    ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResEvents.xml
    ofbiz/trunk/framework/common/config/CommonUiLabels.xml
    ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumEvents.xml

Modified: ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResEvents.xml?rev=1183423&r1=1183422&r2=1183423&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResEvents.xml (original)
+++ ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResEvents.xml Fri Oct 14 16:59:16 2011
@@ -72,7 +72,7 @@
         </entity-and>
         <if-empty field="workEffortList">
             <call-service service-name="createWorkEffortAndPartyAssign" in-map-name="parameters">
-                <default-message>Successfully created.</default-message>
+                <default-message resource="CommonUiLabels" property="CommonSuccessfullyCreated"/>
             </call-service>
             <else>
                 <add-error>

Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=1183423&r1=1183422&r2=1183423&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Fri Oct 14 16:59:16 2011
@@ -8,7 +8,6 @@
     to you under the Apache License, Version 2.0 (the
     "License"); you may not use this file except in compliance
     with the License.  You may obtain a copy of the License at
-
     http://www.apache.org/licenses/LICENSE-2.0
 
     Unless required by applicable law or agreed to in writing,
@@ -2941,6 +2940,14 @@
         <value xml:lang="pt_BR">Índice</value>
         <value xml:lang="zh_TW">索引</value>
     </property>
+    <property key="CommonExternalDevice">
+        <value xml:lang="en">External Device</value>
+        <value xml:lang="fr">Mat. externe</value>
+    </property>
+    <property key="CommonExternalDeviceUserAction">
+        <value xml:lang="en">External Device User Action</value>
+        <value xml:lang="fr">Assoc Action/Utilisateur avec Mat. externe</value>
+    </property>
     <property key="CommonFalse">
         <value xml:lang="ar">خطأ</value>
         <value xml:lang="de">Falsch</value>
@@ -8234,6 +8241,10 @@
         <value xml:lang="zh_CN">小计</value>
         <value xml:lang="zh_TW">小計</value>
     </property>
+    <property key="CommonSuccessfullyCreated">
+        <value xml:lang="en">Successfully created.</value>
+        <value xml:lang="fr">Créé avec succès.</value>
+    </property>    
     <property key="CommonSummary">
         <value xml:lang="de">Zusammenfassung</value>
         <value xml:lang="en">Summary</value>
@@ -9987,8 +9998,13 @@
     </property>
     <property key="FormFieldTitle_acceptButton">
         <value xml:lang="en">Accept</value>
+        <value xml:lang="fr">Accepter</value>
         <value xml:lang="pt_BR">Aceitar</value>
     </property>
+    <property key="FormFieldTitle_actionEnumId">
+        <value xml:lang="en">Action</value>
+        <value xml:lang="fr">Action</value>
+    </property>
     <property key="FormFieldTitle_addButton">
         <value xml:lang="ar">إضافة</value>
         <value xml:lang="de">Hinzufügen</value>
@@ -10058,6 +10074,10 @@
         <value xml:lang="zh">属性值</value>
         <value xml:lang="zh_TW">屬性值</value>
     </property>
+    <property key="FormFieldTitle_cmdToCall">
+        <value xml:lang="en">Cmd To Call</value>
+        <value xml:lang="fr">Cmd d'appel</value>
+    </property>
     <property key="FormFieldTitle_comments">
         <value xml:lang="ar">تعاليق</value>
         <value xml:lang="de">Anmerkungen</value>
@@ -10262,6 +10282,10 @@
         <value xml:lang="zh">描述</value>
         <value xml:lang="zh_TW">描述</value>
     </property>
+    <property key="FormFieldTitle_deviceLocation">
+        <value xml:lang="en">Device Location</value>
+        <value xml:lang="fr">Emplacement</value>
+    </property>
     <property key="FormFieldTitle_effectiveDate">
         <value xml:lang="ar">تاريخ الفاعلية</value>
         <value xml:lang="de">Effektives Datum</value>
@@ -10284,6 +10308,22 @@
         <value xml:lang="zh">有效日期</value>
         <value xml:lang="zh_TW">有效日</value>
     </property>
+    <property key="FormFieldTitle_externalDeviceId">
+        <value xml:lang="en">External Device Id</value>
+        <value xml:lang="fr">Réf. Mat. Externe</value>
+    </property>
+    <property key="FormFieldTitle_externalDeviceTypeId">
+        <value xml:lang="en">External Device Type Id</value>
+        <value xml:lang="fr">Type de Mat. Externe</value>
+    </property>
+    <property key="FormFieldTitle_extDevicePurposeActionId">
+        <value xml:lang="en">External Device Purpose Action Id</value>
+        <value xml:lang="fr">Obj. de l'action</value>
+    </property>
+    <property key="FormFieldTitle_deviceLocation">
+        <value xml:lang="en">Device Location</value>
+        <value xml:lang="fr">Emplacement</value>
+    </property>
     <property key="FormFieldTitle_fromDate">
         <value xml:lang="ar">تاريخ البدء</value>
         <value xml:lang="de">Von Datum</value>

Modified: ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumEvents.xml?rev=1183423&r1=1183422&r2=1183423&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumEvents.xml (original)
+++ ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumEvents.xml Fri Oct 14 16:59:16 2011
@@ -1293,7 +1293,7 @@
             <set field="roleData.roleTypeId" value="SCRUM_MEMBER"/>
             <set field="roleData.userLogin" from-field="sysUserLogin"/>
             <call-service service-name="createPartyRole" in-map-name="roleData">
-                <default-message>Successfully created.</default-message>
+                <default-message resource="CommonUiLabels" property="CommonSuccessfullyCreated"/>
             </call-service>
         </if-empty>
     </simple-method>
@@ -2790,7 +2790,7 @@
                 <set field="update.currentStatusId" value="STS_COMPLETED"/>
                 <set field="update.webSiteId" from-field="parameters.webSiteId"/>
                 <call-service service-name="updateWorkEffort" in-map-name="update">
-                    <default-message>Successfully</default-message>
+                    <default-message resource="CommonUiLabels" property="CommonSuccessfullyCreated"/>
                 </call-service>
             <else>
                 <set field="create.workEffortId" from-field="parameters.workEffortId"/>