From 54aecc45308577a1d954e9c3be6b30a741312246 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= Date: Mon, 12 Apr 2010 20:43:36 +0200 Subject: [PATCH] ItEr54S04ValidacionEProbasFuncionaisItEr53S04: [Bug #377] Added i18n support to HoursManagementEnum and PositionInWorkReportEnum --- .../workreports/entities/HoursManagementEnum.java | 8 +++++--- .../entities/PositionInWorkReportEnum.java | 12 ++++++++++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/HoursManagementEnum.java b/navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/HoursManagementEnum.java index 5f0199ed9..7c7fed03c 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/HoursManagementEnum.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/HoursManagementEnum.java @@ -23,11 +23,13 @@ */ package org.navalplanner.business.workreports.entities; +import static org.navalplanner.business.i18n.I18nHelper._; + public enum HoursManagementEnum { - NUMBER_OF_HOURS("Number of assigned hours."), HOURS_CALCULATED_BY_CLOCK( - "Number of hours caculated by clock."), NUMBER_OF_HOURS_AND_CLOCK( - "Number of assigned hours and the time."); + NUMBER_OF_HOURS(_("Number of assigned hours.")), + HOURS_CALCULATED_BY_CLOCK(_("Number of hours calculated by clock.")), + NUMBER_OF_HOURS_AND_CLOCK(_("Number of assigned hours and the time.")); private String description; diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/PositionInWorkReportEnum.java b/navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/PositionInWorkReportEnum.java index edd1ca387..ce76bdcfd 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/PositionInWorkReportEnum.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/workreports/entities/PositionInWorkReportEnum.java @@ -23,19 +23,27 @@ */ package org.navalplanner.business.workreports.entities; +import static org.navalplanner.business.i18n.I18nHelper._; + /** * @author Susana Montes Pedreira */ public enum PositionInWorkReportEnum { - HEADING, LINE; + HEADING(_("heading")), LINE(_("line")); + + private String displayName; + + private PositionInWorkReportEnum(String displayName) { + this.displayName = displayName; + } public static PositionInWorkReportEnum getDefault() { return LINE; } public String toString() { - return name().toLowerCase(); + return displayName; } }