From 86ca3c69dd3db28065cf212b3b88fcaa1f30a6a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= Date: Tue, 17 Jul 2012 12:35:12 +0200 Subject: [PATCH] i18n: Use the same error messages in the assigned criteria tab for both workers and machines. FEA: ItEr76S04BugFixing --- .../web/resources/worker/AssignedCriterionsModel.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/AssignedCriterionsModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/AssignedCriterionsModel.java index f913af76c..fe9848bd0 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/AssignedCriterionsModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/AssignedCriterionsModel.java @@ -332,15 +332,13 @@ public class AssignedCriterionsModel extends IntegrationEntityModel implements .getCriterion(); if (checkSameCriterionAndSameInterval(satisfactionDTO)) { throw new IllegalStateException( - _(" The " - + criterion.getName() - + " can not be assigned to this resource. Its interval overlap with other criterion")); + _("The {0} can not be assigned to this resource. Its interval overlaps with other criterion", + criterion.getName())); } if (checkNotAllowSimultaneousCriterionsPerResource(satisfactionDTO)) { throw new IllegalStateException( - _(" The " - + criterion.getName() - + "is not valid, the criterionType overlap other criterionSatisfaction whith same criterionType")); + _("The {0} is not valid. Other value exists from the same criterion type", + criterion.getName())); } } }