From fa59ac32e199bbebbf397af11df2dccc1c623066 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Mon, 20 Sep 2010 00:49:24 +0200 Subject: [PATCH] Fix bug A i18n string must not be static final. Otherwise it would always return the same string instead of using the version for the current locale. FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04 --- .../business/resources/entities/Criterion.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java index 6bf3c1dcb..0d024e263 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Criterion.java @@ -50,8 +50,6 @@ import org.navalplanner.business.resources.daos.ICriterionDAO; */ public class Criterion extends IntegrationEntity implements ICriterion { - private static final String ALL_WORKERS = _("[generic all workers]"); - public static Criterion createUnvalidated(String code, String name, CriterionType type, Criterion parent, Boolean active) { @@ -118,7 +116,12 @@ public class Criterion extends IntegrationEntity implements ICriterion { for (Criterion each: criteria) { names.add(each.getName()); } - return (names.isEmpty()) ? Criterion.ALL_WORKERS : StringUtils.join(names, ","); + return (names.isEmpty()) ? allWorkersCaption() : StringUtils.join( + names, ","); + } + + private static String allWorkersCaption() { + return _("[generic all workers]"); } public void updateUnvalidated(String name, Boolean active) {