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 2009/01/06 11:22:37 UTC

svn commit: r731905 - in /ofbiz/trunk: applications/manufacturing/config/ applications/manufacturing/webapp/manufacturing/jobshopmgt/ applications/workeffort/config/ framework/common/config/ framework/webtools/config/ framework/webtools/webapp/webtools...

Author: jleroux
Date: Tue Jan  6 02:22:31 2009
New Revision: 731905

URL: http://svn.apache.org/viewvc?rev=731905&view=rev
Log:
Some uilabels maintenance

Modified:
    ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml
    ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml
    ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml
    ofbiz/trunk/framework/common/config/CommonUiLabels.xml
    ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml
    ofbiz/trunk/framework/webtools/webapp/webtools/workflow/workflowMonitor.ftl
    ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml
    ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml

Modified: ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml?rev=731905&r1=731904&r2=731905&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml (original)
+++ ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml Tue Jan  6 02:22:31 2009
@@ -500,16 +500,6 @@
         <value xml:lang="it">Materiali Attuali</value>
         <value xml:lang="th">ข้อเท็จจริง</value>
     </property>
-    <property key="ManufacturingActualStartDate">
-        <value xml:lang="de">Ist-Start-Datum</value>
-        <value xml:lang="en">Start Date</value>
-        <value xml:lang="es">Fecha de inicio real</value>
-        <value xml:lang="fr">Date de début</value>
-        <value xml:lang="it">Data inizio</value>
-        <value xml:lang="ro">Data Initiala</value>
-        <value xml:lang="th">วันที่เริ่มต้น</value>
-        <value xml:lang="zh">开始日期</value>
-    </property>
     <property key="ManufacturingActualStartDateTime">
         <value xml:lang="de">Ist-Start-Zeit</value>
         <value xml:lang="en">Actual Start Date/Time</value>

Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml?rev=731905&r1=731904&r2=731905&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml Tue Jan  6 02:22:31 2009
@@ -233,7 +233,7 @@
             <display/>
         </field>
         <field name="estimatedStartDate" title="${uiLabelMap.ManufacturingEstimatedStartDate}"><display/></field>
-        <field name="actualStartDate" title="${uiLabelMap.ManufacturingActualStartDate}"><display/></field>
+        <field name="actualStartDate" title="${uiLabelMap.CommonActualStartDate}"><display/></field>
         <field name="estimatedCompletionDate" title="${uiLabelMap.ManufacturingEstimatedCompletionDate}"><display/></field>
         <field name="actualCompletionDate" title="${uiLabelMap.ManufacturingActualCompletionDate}"><display/></field>
         <field name="productionRunName"  title="${uiLabelMap.ManufacturingProductionRunName}"><display/></field>
@@ -671,7 +671,7 @@
         <field name="estimatedCompletionDate" entry-name="workEffortIdFrom">
             <display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${estimatedCompletionDate} " cache="true"/>
         </field>
-        <field name="actualStartDate" title="${uiLabelMap.ManufacturingActualStartDate}" entry-name="workEffortIdFrom">
+        <field name="actualStartDate" title="${uiLabelMap.CommonActualStartDate}" entry-name="workEffortIdFrom">
             <display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${actualStartDate} " cache="true"/>
         </field>
         <field name="actualCompletionDate" title="${uiLabelMap.ManufacturingActualCompletionDate}" entry-name="workEffortIdFrom">
@@ -698,7 +698,7 @@
         <field name="estimatedCompletionDate" entry-name="workEffortIdTo">
             <display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${estimatedCompletionDate} " cache="true"/>
         </field>
-        <field name="actualStartDate" title="${uiLabelMap.ManufacturingActualStartDate}" entry-name="workEffortIdTo">
+        <field name="actualStartDate" title="${uiLabelMap.CommonActualStartDate}" entry-name="workEffortIdTo">
             <display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${actualStartDate} " cache="true"/>
         </field>
         <field name="actualCompletionDate" title="${uiLabelMap.ManufacturingActualCompletionDate}" entry-name="workEffortIdTo">

Modified: ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml?rev=731905&r1=731904&r2=731905&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml (original)
+++ ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml Tue Jan  6 02:22:31 2009
@@ -59,7 +59,7 @@
         <value xml:lang="de">Ist-Anfangsdatum</value>
         <value xml:lang="en">Actual Start Date</value>
         <value xml:lang="es">Fecha de comienzo real</value>
-        <value xml:lang="fr">Date de début</value>
+        <value xml:lang="fr">Date de début réelle</value>
         <value xml:lang="it">Data Inizio Attuale</value>
         <value xml:lang="nl">Actual Start Date</value>
         <value xml:lang="ro">Data Initiere Actuala</value>

Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=731905&r1=731904&r2=731905&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Tue Jan  6 02:22:31 2009
@@ -133,6 +133,17 @@
         <value xml:lang="zh">仅有效</value>
         <value xml:lang="zh_CN">在用</value>
     </property>
+    <property key="CommonActualStartDate">
+        <value xml:lang="de">Ist-Anfangsdatum</value>
+        <value xml:lang="en">Actual Start Date</value>
+        <value xml:lang="es">Fecha de comienzo real</value>
+        <value xml:lang="fr">Date de début réelle</value>
+        <value xml:lang="it">Data Inizio Attuale</value>
+        <value xml:lang="nl">Actual Start Date</value>
+        <value xml:lang="ro">Data Initiere Actuala</value>
+        <value xml:lang="th">วันที่เริ่มตามความจริง</value>
+        <value xml:lang="zh">实际开始日期</value>
+    </property>
     <property key="CommonAdd">
         <value xml:lang="ar">إضافة</value>
         <value xml:lang="cs">Přidat</value>
@@ -5194,6 +5205,7 @@
     </property>
     <property key="CommonRevertPortalPage">
         <value xml:lang="en">revert to original</value>
+        <value xml:lang="fr">Revenir à l'original</value>
         <value xml:lang="th">แปลงเป็นต้นฉบับ</value>
     </property>
     <property key="CommonReview">

Modified: ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml?rev=731905&r1=731904&r2=731905&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml (original)
+++ ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml Tue Jan  6 02:22:31 2009
@@ -3270,13 +3270,6 @@
         <value xml:lang="it">Data Fine Attuale</value>
         <value xml:lang="th">วันที่เสร็จจริง</value>
     </property>
-    <property key="WebtoolsWorkflowActualStartDate">
-        <value xml:lang="de">Ist-Anfangsdatum</value>
-        <value xml:lang="en">Actual Start Date</value>
-        <value xml:lang="fr">Date de début réelle</value>
-        <value xml:lang="it">Data Inizio Attuale</value>
-        <value xml:lang="th">วันที่เริ่มงานจริง</value>
-    </property>
     <property key="WebtoolsWorkflowAssignments">
         <value xml:lang="en">Assignation(s)</value>
         <value xml:lang="fr">Tâche (s)</value>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/workflow/workflowMonitor.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/workflow/workflowMonitor.ftl?rev=731905&r1=731904&r2=731905&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/workflow/workflowMonitor.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/workflow/workflowMonitor.ftl Tue Jan  6 02:22:31 2009
@@ -31,7 +31,7 @@
           <td>${uiLabelMap.WebtoolsWorkflowProcessVersion}</td>
           <td>${uiLabelMap.WebtoolsWorkflowCurrentStatus}</td>
           <td>${uiLabelMap.WebtoolsPriority}</div></td>
-          <td>${uiLabelMap.WebtoolsWorkflowActualStartDate}</div></td>
+          <td>${uiLabelMap.CommonActualStartDate}</div></td>
           <td>${uiLabelMap.WebtoolsWorkflowSourceReferenceId}</div></td>
           <td>&nbsp;</td>
         </tr>
@@ -64,7 +64,7 @@
             <td>${uiLabelMap.WebtoolsWorkflowActivityId}</td>
             <td>${uiLabelMap.Priority}</td>
             <td>${uiLabelMap.WebtoolsWorkflowCurrentStatus}</td>
-            <td>${uiLabelMap.WebtoolsWorkflowActualStartDate}</td>
+            <td>${uiLabelMap.CommonActualStartDate}</td>
             <td>${uiLabelMap.WebtoolsWorkflowActualCompleteDate}</td>
             <td>${uiLabelMap.WebtoolsWorkflowAssignments}</td>
           </tr>

Modified: ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml?rev=731905&r1=731904&r2=731905&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml Tue Jan  6 02:22:31 2009
@@ -18,10 +18,6 @@
     under the License.
 -->
 <resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <property key="ActualStartDate">
-        <value xml:lang="en">Actual Start Date</value>
-        <value xml:lang="th">วันที่เริ่มทำงานจริง</value>
-    </property>
     <property key="AllEvents">
         <value xml:lang="en">All Communications</value>
         <value xml:lang="fr">Toutes les communications</value>
@@ -59,6 +55,7 @@
     </property>
     <property key="MyportalDashboard">
         <value xml:lang="en">My Portal</value>
+        <value xml:lang="fr">Mon portail</value>
         <value xml:lang="th">ส่วนตัว</value>
     </property>
     <property key="MyCommunications">
@@ -196,6 +193,7 @@
     </property>
     <property key="TitlePageMyportalForNoLogin">
         <value xml:lang="en">My Portal Page</value>
+        <value xml:lang="fr">Ma page de portail</value>
         <value xml:lang="th">หน้าส่วนตัวของฉัน</value>
     </property>
     <property key="toComplete">

Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml?rev=731905&r1=731904&r2=731905&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml Tue Jan  6 02:22:31 2009
@@ -66,7 +66,7 @@
         <field name="workEffortId"><hidden/></field>
         <field name="workEffortName" title="${uiLabelMap.WorkEffortEventName}"><display/></field>
         <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
-        <field name="actualStartDate" title="${uiLabelMap.ActualStartDate}"><display type="date"/></field>
+        <field name="actualStartDate" title="${uiLabelMap.CommonActualStartDate}"><display type="date"/></field>
         <field name="delete"><submit button-type="text-link"/></field>
     </form>