Author: jleroux
Date: Thu Oct 22 20:46:17 2009
New Revision: 828844
URL:
http://svn.apache.org/viewvc?rev=828844&view=revLog:
A patch from Erwan de FERRIERES " Misc. internationalization on projectmgr" (
https://issues.apache.org/jira/browse/OFBIZ-3069) - OFBIZ-3069
Word "week" was hard-coded in a form and a timesheet's total was hardcoded in the groovy script
Modified:
ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy
ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml
Modified: ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml?rev=828844&r1=828843&r2=828844&view=diff==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml Thu Oct 22 20:46:17 2009
@@ -1387,6 +1387,10 @@
<value xml:lang="th">à¸à¹à¸à¸«à¸²à¸à¸²à¸à¹à¸ªà¸à¸à¸à¸à¸à¹à¸à¸</value>
<value xml:lang="zh">æ¥æ¾ä»»å¡çèå´</value>
</property>
+ <property key="ProjectMgrTotals">
+ <value xml:lang="en">Totals</value>
+ <value xml:lang="fr">Totaux</value>
+ </property>
<property key="ProjectMgrTreeDetails">
<value xml:lang="en">Tree Details</value>
<value xml:lang="fr">Détails de l'arborescence</value>
Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy?rev=828844&r1=828843&r2=828844&view=diff==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy Thu Oct 22 20:46:17 2009
@@ -29,6 +29,8 @@
import org.ofbiz.entity.condition.*;
import java.sql.Timestamp;
+uiLabelMap = UtilProperties.getResourceBundleMap("ProjectMgrUiLabels", locale);
+
partyId = parameters.partyId;
if (!partyId) {
partyId = parameters.userLogin.partyId;
@@ -180,7 +182,7 @@
entry.d4 = day4Total;
entry.d5 = day5Total;
entry.d6 = day6Total;
- entry.phaseName = "Totals";
+ entry.phaseName = uiLabelMap.ProjectMgrTotals;
entry.workEffortId = "Totals";
entry.total = day0Total + day1Total + day2Total + day3Total + day4Total + day5Total + day6Total;
entries.add(entry);
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml?rev=828844&r1=828843&r2=828844&view=diff==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml Thu Oct 22 20:46:17 2009
@@ -57,7 +57,7 @@
<widgets>
<decorator-screen name="CommonTimesheetDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <screenlet title="${uiLabelMap.PageTitleTimesheet} ${uiLabelMap.CommonNbr} ${timesheet.timesheetId} week: ${weekNumber} ${uiLabelMap.CommonFrom} ${bsh:timesheet.get("fromDate").toString().substring(0,10)} ${uiLabelMap.CommonTo} ${bsh:timesheet.get("thruDate").toString().substring(0,10)}">
+ <screenlet title="${uiLabelMap.PageTitleTimesheet} ${uiLabelMap.CommonNbr} ${timesheet.timesheetId} ${uiLabelMap.CommonWeek}: ${weekNumber} ${uiLabelMap.CommonFrom} ${bsh:timesheet.get("fromDate").toString().substring(0,10)} ${uiLabelMap.CommonTo} ${bsh:timesheet.get("thruDate").toString().substring(0,10)}">
<section>
<condition>
<if-compare field="timesheet.statusId" operator="equals" value="TIMESHEET_COMPLETED"/>
Locked
