From 9fdce30f68c58219a5c8daf2228810ee832518bd Mon Sep 17 00:00:00 2001 From: Diego Pino Garcia Date: Thu, 13 Aug 2009 14:13:28 +0200 Subject: [PATCH] ItEr21S04ArquitecturaServidorItEr20S04: I18n of WorkReport edition --- .../web/workreports/WorkReportCRUDController.java | 10 +++++++--- .../src/main/webapp/workreports/_editWorkReport.zul | 6 ++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java index 90c729e9b..53a53983e 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java @@ -1,5 +1,7 @@ package org.navalplanner.web.workreports; +import static org.navalplanner.web.I18nHelper._; + import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -42,6 +44,7 @@ import org.zkoss.zul.SimpleListModel; import org.zkoss.zul.Textbox; import org.zkoss.zul.api.Window; + /** * Controller for CRUD actions over a {@link WorkReport} * @@ -80,6 +83,7 @@ public class WorkReportCRUDController extends GenericForwardComposer implements private final static int PAGING = 10; + /** * Delete {@link WorkReport} * @@ -326,11 +330,11 @@ public class WorkReportCRUDController extends GenericForwardComposer implements listHead.setSizable(true); // Add static headers - Listheader listHeadResource = new Listheader(RESOURCE); + Listheader listHeadResource = new Listheader(_("Resource")); listHead.appendChild(listHeadResource); - Listheader listHeadCode = new Listheader(CODE); + Listheader listHeadCode = new Listheader(_("Code")); listHead.appendChild(listHeadCode); - Listheader listHeadNumHours = new Listheader(NUM_HOURS); + Listheader listHeadNumHours = new Listheader(_("Hours")); listHead.appendChild(listHeadNumHours); // Add dynamic headers diff --git a/navalplanner-webapp/src/main/webapp/workreports/_editWorkReport.zul b/navalplanner-webapp/src/main/webapp/workreports/_editWorkReport.zul index b27883a0c..3b0980eee 100644 --- a/navalplanner-webapp/src/main/webapp/workreports/_editWorkReport.zul +++ b/navalplanner-webapp/src/main/webapp/workreports/_editWorkReport.zul @@ -1,3 +1,5 @@ + + @@ -24,10 +26,10 @@ -