[OFBiz] SVN: r7533 - in trunk/applications/workeffort: config widget

jacopo@svn.ofbiz.org jacopo at svn.ofbiz.org
Sat May 6 07:57:01 CDT 2006


Author: jacopo
Date: 2006-05-06 07:56:43 -0500 (Sat, 06 May 2006)
New Revision: 7533

Modified:
   trunk/applications/workeffort/config/WorkEffortUiLabels.properties
   trunk/applications/workeffort/widget/RequestScreens.xml
   trunk/applications/workeffort/widget/TimesheetForms.xml
   trunk/applications/workeffort/widget/TimesheetScreens.xml
   trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml
   trunk/applications/workeffort/widget/WorkEffortForms.xml
   trunk/applications/workeffort/widget/WorkEffortPartyAssignForms.xml
   trunk/applications/workeffort/widget/WorkEffortRelatedSummaryScreens.xml
   trunk/applications/workeffort/widget/WorkEffortRequirementForms.xml
   trunk/applications/workeffort/widget/WorkEffortScreens.xml
Log:
i18n enhancements for the workeffort component from Marco Risaliti.

Modified: trunk/applications/workeffort/config/WorkEffortUiLabels.properties
===================================================================
--- trunk/applications/workeffort/config/WorkEffortUiLabels.properties	2006-05-06 09:22:14 UTC (rev 7532)
+++ trunk/applications/workeffort/config/WorkEffortUiLabels.properties	2006-05-06 12:56:43 UTC (rev 7533)
@@ -50,14 +50,22 @@
 
 PageTitleListWorkEffortTimeEntries=Work Effort Time Entries
 PageTitleAddWorkEffortTimeEntry=Add Time Entry to Work Effort
+PageTitleAddWorkEffortTimeToInvoice=Add Work Effort Time to Invoice
+PageTitleAddWorkEffortTimeToNewInvoice=Add Work Effort Time to New Invoice
 
 PageTitleFindTimesheet=Find Timesheet
 PageTitleEditTimesheet=Edit Timesheet
 PageTitleAddTimesheet=Add Timesheet
+PageTitleCreateWeekTimesheet=Create Timesheet for This Week
 
 PageTitleEditTimesheetRoles=Edit Timesheet Roles
 PageTitleEditTimesheetEntries=Edit Timesheet Entries
 
+PageTitleCalendarDay=Calendar Day
+PageTitleCalendarWeek=Calendar Week
+PageTitleCalendarMonth=Calendar Month
+PageTitleCalendarUpcoming=Calendar Upcoming
+
 PartyAddressLine1=Address Line 1
 PartyAddressLine2=Address Line 2
 PartyAddContactInformationParty=Add this contact information to party
@@ -97,12 +105,14 @@
 
 Timesheet=Timesheet
 TimesheetCreate=Create Timesheet
+TimesheetHours=Hours
 TimesheetMyTime=My Time
 TimesheetRates=Rates
 TimesheetRateType=Rate Type
 TimesheetTimesheetId=Timesheet ID
 TimesheetTimeEntries=Time Entries
 TimesheetTimeEntry=Time Entry
+TimesheetQuickTimeEntry=Quick Time Entry
 
 WorkEffort=Work Effort
 WorkEfforts=Work Efforts
@@ -110,6 +120,7 @@
 WorkEffortActivityDetail=Activity Detail
 WorkEffortActivityName=Activity Name
 WorkEffortActivityStatus=Activity Status
+WorkEffortAddChild=Add Child
 WorkEffortAddTask=Add Task
 WorkEffortAddExistingTask=Add An Existing Task (WorkEffortId) 
 WorkEffortAllPhases=All Phases
@@ -117,6 +128,12 @@
 WorkEffortApplicationEventsTasksWorkflowActivities=This application is meant for those who maintain and use calendar events tasks and workflow activities
 WorkEffortAssignedTasks=Assigned Tasks
 WorkEffortAttender=Attender
+WorkEffortBanner1=Enter an existing workEffortId below,
+WorkEffortBanner2=OR enter the WorkEffort below (leave the workEffort Id blank)
+WorkEffortBanner3=Enter existing CommunicationEvent Id below
+WorkEffortBanner4=OR add new CommunicationEvent data below to create new entity (leave CommunicationEvent Id empty)
+WorkEffortBanner5=Enter existing Requirement Id below
+WorkEffortBanner6=OR add new Requirement data below to create new entity (leave Requirement Id empty)
 WorkEffortByFacility=By Facility
 WorkEffortByFixedAsset=By Fixed Asset
 WorkEffortByPartyId=By Party
@@ -146,7 +163,9 @@
 WorkEffortErrorPermissionViewActivity=ERROR\: You do not have permission to view this activity.This activity must belong to you or you must be an administrator
 WorkEffortErrorPermissionViewEvent= ERROR\: You do not have permission to view this event.This event must be long to you or you must be an administrator
 WorkEffortEstBudget=Est.Budget
-WorkEffortEstmatedBudget=Estmated Budget
+WorkEffortEstmatedBudget=Estimated Budget
+WorkEffortEstimatedStartDate=Estimated Start Date
+WorkEffortEstimatedCompletionDate=Estimated Completion Date
 WorkEffortEvent=Event
 WorkEffortEventName=Event Name
 WorkEffortEventStatus=Event Status
@@ -163,8 +182,11 @@
 WorkEffortMonthView=Month View
 WorkEffortMustRsvp=Must RSVP
 WorkEffortMyCurrentTaskList=My Current TaskList
+WorkEffortMyCurrentTimesheets=My Current Timesheets
+WorkEffortMyRates=My Rates
 WorkEffortMyRequestList=My Request List
 WorkEffortMyStatus=My Status
+WorkEffortMyTimesheets=My Timesheets
 WorkEffortName=Name
 WorkEffortNewEvent=New Event
 WorkEffortNewNote=New Note
@@ -190,6 +212,7 @@
 WorkEffortParties=Parties
 WorkEffortPartyId=Party Id
 WorkEffortPassword=Password
+WorkEffortPercentComplete=Percent Complete
 WorkEffortPhase=Phase
 WorkEffortPhaseStatus=Phase Status
 WorkEffortPhaseTasks=PhaseTasks
@@ -241,6 +264,8 @@
 WorkEffortTaskList=TaskList
 WorkEffortTasks=Tasks
 WorkEffortTaskStatus=TaskStatus
+WorkEffortTimeBillFromParty=Bill From Party
+WorkEffortTimeBillToParty=Bill To Party
 WorkEffortThisMonth=This Month
 WorkEffortThisWeek=This Week
 WorkEffortUpcomingEvents=Upcoming Events
@@ -260,6 +285,7 @@
 WorkEffortWorkflowActivitiesUserGroup=Workflow activities assigned to User Group
 WorkEffortWorkflowActivitiesUserRole=Workflow activities assigned to User Role
 
+FormFieldTitle_workEffortId=Work Effort Id
 FormFieldTitle_priority=Priority
 FormFieldTitle_scopeEnumId=Scope
 FormFieldTitle_estimatedStartDate=Estimated Start Date

Modified: trunk/applications/workeffort/widget/RequestScreens.xml
===================================================================
--- trunk/applications/workeffort/widget/RequestScreens.xml	2006-05-06 09:22:14 UTC (rev 7532)
+++ trunk/applications/workeffort/widget/RequestScreens.xml	2006-05-06 12:56:43 UTC (rev 7533)
@@ -28,7 +28,7 @@
     <screen name="RequestList">
         <section>
             <actions>
-                <set field="title" value="List Requests"/>
+                <set field="titleProperty" value="PageTitleListWorkEffortRequests"/>
                 <set field="tabButtonItem" value="requestlist"/>
                 <set field="headerItem" value="request"/>
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>

Modified: trunk/applications/workeffort/widget/TimesheetForms.xml
===================================================================
--- trunk/applications/workeffort/widget/TimesheetForms.xml	2006-05-06 09:22:14 UTC (rev 7532)
+++ trunk/applications/workeffort/widget/TimesheetForms.xml	2006-05-06 12:56:43 UTC (rev 7533)
@@ -124,15 +124,15 @@
         
         <field name="timesheetId"><hidden/></field>
         <field name="invoiceId"><lookup target-form-name="LookupInvoice"/></field>
-        <field name="submitButton" title="Add Timesheet to Existing Invoice" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" title="${uiLabelMap.PageTitleAddWorkEffortTimeToInvoice}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="AddTimesheetToNewInvoice" target="addTimesheetToNewInvoice" title="" type="single"
         default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
         
         <field name="timesheetId"><hidden/></field>
-        <field name="partyIdFrom" title="Bill From Party"><lookup target-form-name="LookupPartyName"/></field>
-        <field name="partyId" title="Bill To Party"><lookup target-form-name="LookupPartyName" default-value="${timesheet.clientPartyId}"/></field>
-        <field name="submitButton" title="Add Timesheet to New Invoice" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="partyIdFrom" title="${uiLabelMap.WorkEffortTimeBillFromParty}"><lookup target-form-name="LookupPartyName"/></field>
+        <field name="partyId" title="${uiLabelMap.WorkEffortTimeBillToParty}"><lookup target-form-name="LookupPartyName" default-value="${timesheet.clientPartyId}"/></field>
+        <field name="submitButton" title="${uiLabelMap.PageTitleAddWorkEffortTimeToNewInvoice}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     
     <!-- TimesheetRole -->
@@ -197,7 +197,7 @@
         
         <field name="workEffortId">
             <lookup size="10" target-form-name="LookupWorkEffort">
-                <sub-hyperlink target="EditWorkEffort?workEffortId=${workEffortId}" link-style="buttontext" description="WE:${workEffortId}"/>
+                <sub-hyperlink target="EditWorkEffort?workEffortId=${workEffortId}" link-style="buttontext" description="${uiLabelMap.WorkEffortWorkEffort}:${workEffortId}"/>
             </lookup>
         </field>
 

Modified: trunk/applications/workeffort/widget/TimesheetScreens.xml
===================================================================
--- trunk/applications/workeffort/widget/TimesheetScreens.xml	2006-05-06 09:22:14 UTC (rev 7532)
+++ trunk/applications/workeffort/widget/TimesheetScreens.xml	2006-05-06 12:56:43 UTC (rev 7533)
@@ -23,7 +23,7 @@
         <section>
             <actions>
                 <set field="headerItem" value="mytime"/>
-                <set field="title" value="My Timesheets"/>
+                <set field="titleProperty" value="WorkEffortMyTimesheets"/>
                 
                 <set field="queryString" from-field="result.queryString"/>
                 <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
@@ -42,9 +42,9 @@
             <widgets>
                 <decorator-screen name="main-decorator" location="component://workeffort/widget/CommonScreens.xml">
                     <decorator-section name="body">
-                        <container><label text="My Current Timesheets" style="head2"/></container>
+                        <container><label text="${uiLabelMap.WorkEffortMyCurrentTimesheets}" style="head2"/></container>
                         <container>
-                            <link text="Create Timesheet for This Week" target="createTimesheetForThisWeek?partyId=${userLogin.partyId}" style="buttontext"/>
+                            <link text="${uiLabelMap.PageTitleCreateWeekTimesheet}" target="createTimesheetForThisWeek?partyId=${userLogin.partyId}" style="buttontext"/>
                             <link text="${uiLabelMap.TimesheetCreate}" target="EditTimesheet?partyId=${userLogin.partyId}" style="buttontext"/>
                         </container>
                         <iterate-section entry-name="currentTimesheet" list-name="currentTimesheetList">
@@ -59,7 +59,7 @@
                                 </actions>
                                 <widgets>
                                     <container>
-                                        <label style="tableheadtext" text="Timesheet: ${currentTimesheet.fromDate} thru ${currentTimesheet.thruDate} ${currentTimesheet.comments}"/>
+                                        <label style="tableheadtext" text="${uiLabelMap.Timesheet}: ${currentTimesheet.fromDate} ${uiLabelMap.CommonThru} ${currentTimesheet.thruDate} ${currentTimesheet.comments}"/>
                                         <link target="EditTimesheet?timesheetId=${currentTimesheet.timesheetId}" text="${currentTimesheet.timesheetId}" style="buttontext"></link>
                                     </container>
                                     <iterate-section entry-name="currentTimeEntry" list-name="currentTimeEntryList">
@@ -71,12 +71,12 @@
                                             </actions>
                                             <widgets>
                                                 <container>
-                                                    <label style="tabletext" text="Entry for ${currentTimeEntry.fromDate} "/>
-                                                    <label style="tableheadtext" text="${currentTimeEntry.hours} hours "/>
+                                                    <label style="tabletext" text="${uiLabelMap.TimesheetTimeEntry} ${uiLabelMap.CommonFor} ${currentTimeEntry.fromDate} "/>
+                                                    <label style="tableheadtext" text="${currentTimeEntry.hours} ${uiLabelMap.TimesheetHours} "/>
                                                     <label style="tabletext" text="${currentTimeEntry.comments} [${currentRateType.description}]"/>
                                                     <section>
                                                         <condition><not><if-empty field-name="currentTimeEntry.workEffortId"/></not></condition>
-                                                        <widgets><link target="WorkEffortSummary?workEffortId=${currentTimeEntry.workEffortId}" text="WE: ${currentTimeEntry.workEffortId}" style="linktext"/></widgets>
+                                                        <widgets><link target="WorkEffortSummary?workEffortId=${currentTimeEntry.workEffortId}" text="${uiLabelMap.WorkEffort}: ${currentTimeEntry.workEffortId}" style="linktext"/></widgets>
                                                     </section>
                                                 </container>
                                             </widgets>
@@ -89,8 +89,8 @@
                                         </widgets>
                                         <fail-widgets>
                                             <container>
-                                                <link target="MyTimesheets?showQuickEntry=${currentTimesheet.timesheetId}" text="Quick Time Entry" style="buttontext"></link>
-                                                <link target="EditTimesheetEntries?timesheetId=${currentTimesheet.timesheetId}" text="Timesheet Entries" style="buttontext"></link>
+                                                <link target="MyTimesheets?showQuickEntry=${currentTimesheet.timesheetId}" text="${uiLabelMap.TimesheetQuickTimeEntry}" style="buttontext"></link>
+                                                <link target="EditTimesheetEntries?timesheetId=${currentTimesheet.timesheetId}" text="${uiLabelMap.TimesheetTimeEntries}" style="buttontext"></link>
                                             </container>
                                         </fail-widgets>
                                     </section>
@@ -100,9 +100,9 @@
                         
                         <!-- createQuickTimeEntry -->
                         
-                        <container><label text="My Rates" style="head2"/></container>
+                        <container><label text="${uiLabelMap.WorkEffortMyRates}" style="head2"/></container>
                         <include-form name="ListMyRates" location="component://workeffort/widget/TimesheetForms.xml"/>
-                        <container><label text="My Timesheets" style="head2"/></container>
+                        <container><label text="${uiLabelMap.WorkEffortMyTimesheets}" style="head2"/></container>
                         <include-form name="ListMyTimesheets" location="component://workeffort/widget/TimesheetForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
@@ -160,7 +160,7 @@
                                     <condition><not><if-empty field-name="timesheetId"/></not></condition>
                                     <widgets>
                                         <include-menu name="TimesheetTabBar" location="component://workeffort/widget/TimesheetMenus.xml"/>
-                                        <container><label style="head1">TimesheetId: ${timesheetId}</label></container>
+                                        <container><label style="head1">${uiLabelMap.TimesheetTimesheetId}: ${timesheetId}</label></container>
                                     </widgets>
                                 </section>
                                 

Modified: trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml
===================================================================
--- trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml	2006-05-06 09:22:14 UTC (rev 7532)
+++ trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml	2006-05-06 12:56:43 UTC (rev 7533)
@@ -50,9 +50,9 @@
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="buttontext"><submit button-type="text-link"/></field>
         <sort-order>
             <sort-field name="workEffortId"/>
-            <banner left-text-style="tabletext" left-text="Enter existing CommunicationEvent Id below"/>
+            <banner left-text-style="tabletext" left-text="${uiLabelMap.WorkEffortBanner3}"/>
             <sort-field name="communicationEventId"/>
-            <banner left-text-style="tabletext" left-text="OR add new CommunicationEvent data below to create new entity (leave CommunicationEvent Id empty)"/>
+            <banner left-text-style="tabletext" left-text="${uiLabelMap.WorkEffortBanner4}"/>
             <sort-field name="description"/>
         </sort-order>
     </form>

Modified: trunk/applications/workeffort/widget/WorkEffortForms.xml
===================================================================
--- trunk/applications/workeffort/widget/WorkEffortForms.xml	2006-05-06 09:22:14 UTC (rev 7532)
+++ trunk/applications/workeffort/widget/WorkEffortForms.xml	2006-05-06 12:56:43 UTC (rev 7533)
@@ -249,9 +249,9 @@
             <sort-field name="sequenceNum"/>
             <sort-field name="fromDate"/>
             <sort-field name="thruDate"/>
-            <banner left-text-style="tabletext" left-text="Enter an existing workEffortId below,"/>
+            <banner left-text-style="tabletext" left-text="${uiLabelMap.WorkEffortBanner1}"/>
             <sort-field name="workEffortIdFrom"/>
-            <banner left-text-style="tabletext" left-text="OR enter the WorkEffort below (leave the workEffort Id blank)"/>
+            <banner left-text-style="tabletext" left-text="${uiLabelMap.WorkEffortBanner2}"/>
             <sort-field name="workEffortName"/>
             <sort-field name="description"/>
         </sort-order>
@@ -298,13 +298,13 @@
         <field name="workEffortTypeId"><display-entity entity-name="WorkEffortType"/></field>
         <field name="workEffortPurposeTypeId"><display-entity entity-name="WorkEffortPurposeType"/></field>
         <field name="editLink" title="" widget-style="linktext">
-            <hyperlink also-hidden="false" description="Edit" target="EditWorkEffort?workEffortId=${workEffortId}&amp;DONE_PAGE=ListWorkEfforts?${queryStringEncoded}"/>
+            <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditWorkEffort?workEffortId=${workEffortId}&amp;DONE_PAGE=ListWorkEfforts?${queryStringEncoded}"/>
         </field>
         <field name="childLink" title="" widget-style="linktext">
-            <hyperlink also-hidden="false" description="SubNodes" target="ChildWorkEfforts?trail=${workEffortId}&amp;DONE_PAGE=ListWorkEfforts?${queryStringEncoded}"/>
+            <hyperlink also-hidden="false" description="${uiLabelMap.WorkEffortChildren}" target="ChildWorkEfforts?trail=${workEffortId}&amp;DONE_PAGE=ListWorkEfforts?${queryStringEncoded}"/>
         </field>
         <field name="editChildLink" title="" widget-style="linktext">
-            <hyperlink also-hidden="false" description="Detail + SubNodes" target="EditListWorkEfforts?trail=${workEffortId}&amp;DONE_PAGE=ListWorkEfforts?${queryStringEncoded}"/>
+            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDetail} + ${uiLabelMap.WorkEffortChildren}" target="EditListWorkEfforts?trail=${workEffortId}&amp;DONE_PAGE=ListWorkEfforts?${queryStringEncoded}"/>
         </field>
         <field name="deleteLink" title="" widget-style="linktext">
             <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeWorkEffort?workEffortId=${workEffortId}"/>
@@ -688,14 +688,14 @@
         
         <field name="workEffortId"><hidden/></field>
         <field name="invoiceId"><lookup target-form-name="LookupInvoice"/></field>
-        <field name="submitButton" title="Add Work Effort Time to Existing Invoice" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" title="${uiLabelMap.PageTitleAddWorkEffortTimeToInvoice}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="AddWorkEffortTimeToNewInvoice" target="addWorkEffortTimeToNewInvoice" title="" type="single"
         default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
         
         <field name="workEffortId"><hidden/></field>
-        <field name="partyIdFrom" title="Bill From Party"><lookup target-form-name="LookupPartyName"/></field>
-        <field name="partyId" title="Bill To Party"><lookup target-form-name="LookupPartyName" default-value="${timesheet.clientPartyId}"/></field>
-        <field name="submitButton" title="Add Work Effort Time to New Invoice" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="partyIdFrom" title="${uiLabelMap.WorkEffortTimeBillFromParty}"><lookup target-form-name="LookupPartyName"/></field>
+        <field name="partyId" title="${uiLabelMap.WorkEffortTimeBillToParty}"><lookup target-form-name="LookupPartyName" default-value="${timesheet.clientPartyId}"/></field>
+        <field name="submitButton" title="${uiLabelMap.PageTitleAddWorkEffortTimeToNewInvoice}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
 </forms>

Modified: trunk/applications/workeffort/widget/WorkEffortPartyAssignForms.xml
===================================================================
--- trunk/applications/workeffort/widget/WorkEffortPartyAssignForms.xml	2006-05-06 09:22:14 UTC (rev 7532)
+++ trunk/applications/workeffort/widget/WorkEffortPartyAssignForms.xml	2006-05-06 12:56:43 UTC (rev 7533)
@@ -31,7 +31,7 @@
             </entity-condition>
         </actions>
         <field name="workEffortId"><hidden/></field>
-        <field name="partyId" title="${uiLabelMap.PartyParty}" widget-style="buttontext">
+        <field name="partyId" widget-style="buttontext">
             <display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}">
                 <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${partyId}" target-type="inter-app" description="${partyId}" link-style="buttontext"/>
             </display-entity>

Modified: trunk/applications/workeffort/widget/WorkEffortRelatedSummaryScreens.xml
===================================================================
--- trunk/applications/workeffort/widget/WorkEffortRelatedSummaryScreens.xml	2006-05-06 09:22:14 UTC (rev 7532)
+++ trunk/applications/workeffort/widget/WorkEffortRelatedSummaryScreens.xml	2006-05-06 12:56:43 UTC (rev 7533)
@@ -58,23 +58,23 @@
             <widgets>
                 <decorator-screen name="CommonWorkEffortDecorator" location="component://workeffort/widget/WorkEffortScreens.xml">
                     <decorator-section name="body">
-                        <label style="head1">${uiLabelMap.PageTitleWorkEffortRelatedSummary} for ID [${workEffortId}]</label>
+                        <label style="head1">${uiLabelMap.PageTitleWorkEffortRelatedSummary} ${uiLabelMap.CommonFor} ${uiLabelMap.CommonId} [${workEffortId}]</label>
                         <container><label style="head2">${uiLabelMap.WorkEffort}</label></container>
                         <container>
-                            <label text="Name: " style="tableheadtext"/><label text="${workEffort.workEffortName}" style="tabletext"/>
-                            <label text=", Type: " style="tableheadtext"/><label text="${workEffortType.description}" style="tabletext"/>
-                            <label text=", Purpose: " style="tableheadtext"/><label text="${workEffortPurposeType.description}" style="tabletext"/>
+                            <label text="${uiLabelMap.CommonName}: " style="tableheadtext"/><label text="${workEffort.workEffortName}" style="tabletext"/>
+                            <label text=", ${uiLabelMap.CommonType}: " style="tableheadtext"/><label text="${workEffortType.description}" style="tabletext"/>
+                            <label text=", ${uiLabelMap.CommonPurpose}: " style="tableheadtext"/><label text="${workEffortPurposeType.description}" style="tabletext"/>
                         </container>
                         <container>
-                            <label text="Status: " style="tableheadtext"/><label text="${currentStatusItem.description}" style="tabletext"/>
-                            <label text=", Percent Complete: " style="tableheadtext"/><label text="${workEffort.percentComplete}" style="tabletext"/>
-                            <label text=", Priority: " style="tableheadtext"/><label text="${workEffort.priority}" style="tabletext"/>
+                            <label text="${uiLabelMap.CommonStatus}: " style="tableheadtext"/><label text="${currentStatusItem.description}" style="tabletext"/>
+                            <label text=", ${uiLabelMap.WorkEffortPercentComplete}: " style="tableheadtext"/><label text="${workEffort.percentComplete}" style="tabletext"/>
+                            <label text=", ${uiLabelMap.CommonPriority}: " style="tableheadtext"/><label text="${workEffort.priority}" style="tabletext"/>
                         </container>
                         <container>
-                            <label text="Estimated Start Date: " style="tableheadtext"/><label text="${workEffort.estimatedStartDate}" style="tabletext"/>
-                            <label text=", Estimated Completion Date: " style="tableheadtext"/><label text="${workEffort.estimatedCompletionDate}" style="tabletext"/>
+                            <label text="${uiLabelMap.WorkEffortEstimatedStartDate}: " style="tableheadtext"/><label text="${workEffort.estimatedStartDate}" style="tabletext"/>
+                            <label text=", ${uiLabelMap.WorkEffortEstimatedCompletionDate}: " style="tableheadtext"/><label text="${workEffort.estimatedCompletionDate}" style="tabletext"/>
                         </container>
-                        <container><label style="head2">Party Assignments</label></container>
+                        <container><label style="head2">${uiLabelMap.PartyPartyAssignmentsDetail}</label></container>
                         <iterate-section list-name="relatedPartyAssigns" entry-name="partyAssign">
                             <section>
                                 <actions>
@@ -86,15 +86,15 @@
                                     <container>
                                         <link target="/partymgr/control/viewprofile?partyId=${partyAssign.partyId}" url-mode="inter-app" text="[${partyAssign.partyId}]" style="linktext"/>
                                         <label text="${partyAssign.firstName} ${partyAssign.lastName} ${partyAssign.groupName}" style="tabletext"/>
-                                        <label text=", Role: " style="tableheadtext"/><label text="${partyAssignRoleType.description}" style="tabletext"/>
-                                        <label text=", Status: " style="tableheadtext"/><label text="${partyAssignStatusItem.description}" style="tabletext"/>
-                                        <label text=", Expectation: " style="tableheadtext"/><label text="${partyAssignExpectationEnumeration.description}" style="tabletext"/>
+                                        <label text=", ${uiLabelMap.PartyRoleId}" style="tableheadtext"/><label text="${partyAssignRoleType.description}" style="tabletext"/>
+                                        <label text=", ${uiLabelMap.CommonStatus}: " style="tableheadtext"/><label text="${partyAssignStatusItem.description}" style="tabletext"/>
+                                        <label text=", ${uiLabelMap.CommonExpectation}: " style="tableheadtext"/><label text="${partyAssignExpectationEnumeration.description}" style="tabletext"/>
                                     </container>
                                 </widgets>
                             </section>
                         </iterate-section>
                         
-                        <container><label style="head2">Communication Events</label></container>
+                        <container><label style="head2">${uiLabelMap.WorkEffortCommEvents}</label></container>
                         <iterate-section list-name="commEvents" entry-name="commEvent">
                             <section>
                                 <widgets>
@@ -106,7 +106,7 @@
                             </section>
                         </iterate-section>
                         
-                        <container><label style="head2">Shopping Lists</label></container>
+                        <container><label style="head2">${uiLabelMap.WorkEffortShopLists}</label></container>
                         <iterate-section list-name="shoppingLists" entry-name="shopList">
                             <section>
                                 <widgets>
@@ -118,7 +118,7 @@
                             </section>
                         </iterate-section>
                         
-                        <container><label style="head2">Quotes</label></container>
+                        <container><label style="head2">${uiLabelMap.WorkEffortQuotes}</label></container>
                         <iterate-section list-name="quotes" entry-name="quote">
                             <section>
                                 <widgets>
@@ -130,16 +130,16 @@
                             </section>
                         </iterate-section>
                         
-                        <container><label style="head2">Orders</label></container>
+                        <container><label style="head2">${uiLabelMap.WorkEffortOrderHeaders}</label></container>
                         <iterate-section list-name="orderHeaders" entry-name="orderHeader">
                             <section>
                                 <widgets>
                                     <container>
                                         <link target="/ordermgr/control/orderview?orderId=${orderHeader.orderId}" url-mode="inter-app" text="[${orderHeader.orderId}]" style="linktext"/>
-                                        <label text="Type: " style="tableheadtext"/><label text="${orderHeader.orderTypeDescription}" style="tabletext"/>
-                                        <label text=", Status: " style="tableheadtext"/><label text="${orderHeader.statusItemDescription}" style="tabletext"/>
-                                        <label text=", Total: " style="tableheadtext"/><label text="${orderHeader.grandTotal}" style="tabletext"/>
-                                        <label text=", Date: " style="tableheadtext"/><label text="${orderHeader.orderDate}" style="tabletext"/>
+                                        <label text="${uiLabelMap.CommonType}: " style="tableheadtext"/><label text="${orderHeader.orderTypeDescription}" style="tabletext"/>
+                                        <label text=", ${uiLabelMap.CommonStatus} : " style="tableheadtext"/><label text="${orderHeader.statusItemDescription}" style="tabletext"/>
+                                        <label text=", ${uiLabelMap.CommonTotal}: " style="tableheadtext"/><label text="${orderHeader.grandTotal}" style="tabletext"/>
+                                        <label text=", ${uiLabelMap.CommonDate}: " style="tableheadtext"/><label text="${orderHeader.orderDate}" style="tabletext"/>
                                     </container>
                                 </widgets>
                             </section>

Modified: trunk/applications/workeffort/widget/WorkEffortRequirementForms.xml
===================================================================
--- trunk/applications/workeffort/widget/WorkEffortRequirementForms.xml	2006-05-06 09:22:14 UTC (rev 7532)
+++ trunk/applications/workeffort/widget/WorkEffortRequirementForms.xml	2006-05-06 12:56:43 UTC (rev 7533)
@@ -31,7 +31,7 @@
             </entity-and>
         </actions>
         <field name="workEffortId"><hidden/></field>
-        <field name="requirementId" title="${uiLabelMap.WorkEffortRequirementId}" widget-style="linktext">
+        <field name="requirementId" widget-style="linktext">
             <hyperlink target="/ordermgr/control/EditRequirement?requirementId=${requirementId}" target-type="inter-app" description="${requirementId}"/>
         </field>
         <field name="workReqFulfTypeDescription"><display/></field>
@@ -53,9 +53,9 @@
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
         <sort-order>
-            <banner left-text-style="tabletext" left-text="Enter existing Requirement Id below"/>
+            <banner left-text-style="tabletext" left-text="${uiLabelMap.WorkEffortBanner5}"/>
             <sort-field name="requirementId"/>
-            <banner left-text-style="tabletext" left-text="OR add new Requirement data below to create new entity (leave Requirement Id empty)"/>
+            <banner left-text-style="tabletext" left-text="${uiLabelMap.WorkEffortBanner6}"/>
             <sort-field name="workReqFulfTypeId"/>
         </sort-order>
     </form>

Modified: trunk/applications/workeffort/widget/WorkEffortScreens.xml
===================================================================
--- trunk/applications/workeffort/widget/WorkEffortScreens.xml	2006-05-06 09:22:14 UTC (rev 7532)
+++ trunk/applications/workeffort/widget/WorkEffortScreens.xml	2006-05-06 12:56:43 UTC (rev 7533)
@@ -75,7 +75,7 @@
                                     <condition><not><if-empty field-name="workEffortId"/></not></condition>
                                     <widgets>
                                         <include-menu name="WorkEffortTabBar" location="component://workeffort/widget/WorkEffortMenus.xml"/>
-                                        <container><label style="head1">WorkEffortId: ${workEffortId}</label></container>
+                                        <container><label style="head1">${uiLabelMap.WorkEffortWorkEffortId}: ${workEffortId}</label></container>
                                     </widgets>
                                 </section>
                                 
@@ -148,9 +148,9 @@
     <screen name="ListWorkEfforts">
         <section>
             <actions>
-                <set field="titleProperty" value="PageTitleListWorkEffort"/>
+                <set field="titleProperty" value="PageTitleListWorkEfforts"/>
                 <set field="tabButtonItem" value="WorkEffort"/>
-                <set field="labelTitleProperty" value="PageTitleListWorkEffort"/>
+                <set field="labelTitleProperty" value="PageTitleListWorkEfforts"/>
 
                 <set field="workEffortId" from-field="parameters.workEffortId"/>
             </actions>
@@ -169,9 +169,9 @@
     <screen name="ChildWorkEfforts">
         <section>
             <actions>
-                <set field="titleProperty" value="PageTitleListWorkEffort"/>
+                <set field="titleProperty" value="PageTitleListWorkEfforts"/>
                 <set field="tabButtonItem" value="WorkEffortAssocs"/>
-                <set field="labelTitleProperty" value="PageTitleListWorkEffort"/>
+                <set field="labelTitleProperty" value="PageTitleListWorkEfforts"/>
 
                 <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/workeffort/control/ListWorkEfforts"/>
                 <set field="trail" from-field="parameters.trail"/>
@@ -197,7 +197,7 @@
             <widgets> 
                 <label text=" ${workEffort.workEffortName} - ${workEffort.description}" style="tabletext"/>
                 <link target="EditWorkEffort?workEffortId=${workEffort.workEffortId}" text="[${workEffort.workEffortId}]" style="linktext"/>
-                <link target="AddWorkEffortAndAssoc?workEffortIdTo=${workEffort.workEffortId}" text="Add Child" style="linktext"></link>
+                <link target="AddWorkEffortAndAssoc?workEffortIdTo=${workEffort.workEffortId}" text="${uiLabelMap.WorkEffortAddChild}" style="linktext"></link>
                 <section>
                     <condition>
                         <not>
@@ -471,9 +471,9 @@
                         <container><label style="head1">${uiLabelMap.PageTitleAddWorkEffortTimeEntry}</label></container>
                         <include-form name="AddWorkEffortTimeEntry" location="component://workeffort/widget/WorkEffortForms.xml"/>
 
-                        <container><label style="head1">Add Work Effort Time to Invoice</label></container>
+                        <container><label style="head1">${uiLabelMap.PageTitleAddWorkEffortTimeToInvoice}</label></container>
                         <include-form name="AddWorkEffortTimeToInvoice" location="component://workeffort/widget/WorkEffortForms.xml"/>
-                        <container><label style="head1">Add Work Effort Time to New Invoice</label></container>
+                        <container><label style="head1">${uiLabelMap.PageTitleAddWorkEffortTimeToNewInvoice}</label></container>
                         <include-form name="AddWorkEffortTimeToNewInvoice" location="component://workeffort/widget/WorkEffortForms.xml"/>
                     </decorator-section>
                 </decorator-screen>



More information about the Svn mailing list