From 6791de1946144ac0d44df562fbba188b9fa63f14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= Date: Thu, 5 Nov 2009 12:26:50 +0100 Subject: [PATCH] ItEr33S06DocumentacionFormacionItEr32S07 Corrections in English literals Some of the hard-coded English literals were corrected. --- .../navalplanner/web/advance/AdvanceTypeCRUDController.java | 2 +- .../web/calendars/BaseCalendarCRUDController.java | 2 +- .../web/calendars/BaseCalendarEditionController.java | 2 +- .../org/navalplanner/web/common/CustomMenuController.java | 6 +++--- .../web/orders/ManageOrderElementAdvancesController.java | 2 +- .../org/navalplanner/web/planner/allocation/FormBinder.java | 2 +- .../web/planner/tabs/MultipleTabsPlannerController.java | 2 +- .../resources/criterion/CriterionAdminController_V2.java | 2 +- .../resources/machine/AssignedMachineCriterionsModel.java | 2 +- .../web/resources/worker/CriterionsController.java | 4 ++-- .../org/navalplanner/web/resources/worker/WorkerModel.java | 2 +- .../src/main/webapp/orders/_listOrderElementHours.zul | 4 ++-- .../src/main/webapp/orders/_orderElementDetails.zul | 4 ++-- navalplanner-webapp/src/main/webapp/planner/order.zul | 6 +++--- .../main/webapp/resources/criterions/_criterionsTree.zul | 2 +- .../src/main/webapp/resources/machine/_editMachine.zul | 2 +- .../main/webapp/resources/machine/_machineCriterions.zul | 6 +++--- .../src/main/webapp/resources/search/worker_search.zul | 4 ++-- .../src/main/webapp/resources/worker/_criterions.zul | 6 +++--- .../src/main/webapp/resources/worker/_edition.zul | 2 +- .../src/main/webapp/resources/worker/_localizations.zul | 2 +- .../src/main/webapp/workreports/_editWorkReport.zul | 6 +++--- 22 files changed, 36 insertions(+), 36 deletions(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java index 698942232..013606090 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java @@ -151,7 +151,7 @@ public class AdvanceTypeCRUDController extends GenericForwardComposer { } if (!(advanceTypeModel.distinctNames((String) value))) { throw new WrongValueException(comp, - _("The name is not valid, Exist other advance type with a similar name. ")); + _("The name is not valid, there is another advance type with a similar name. ")); } } }; diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java index f2ecb4ad5..66ebd2b8b 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java @@ -170,7 +170,7 @@ public class BaseCalendarCRUDController extends GenericForwardComposer { messagesForUser .showMessage(Level.ERROR, _("The calendar was not removed because it still has children. " - + "Some other calendar is derived from this.")); + + "Some other calendar is derived from this one.")); } else { baseCalendarModel.confirmRemove(); hideConfirmingWindow(); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java index 84db26184..794471472 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java @@ -375,7 +375,7 @@ public abstract class BaseCalendarEditionController extends switch (typeOfDay) { case ANCESTOR_EXCEPTION: - return _("Derived excpetion"); + return _("Derived exception"); case OWN_EXCEPTION: return _("Exception"); case ZERO_HOURS: diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java index 78fd94ae2..3cb5fa3ca 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java @@ -164,7 +164,7 @@ public class CustomMenuController extends Div implements IMenuItemsRegister { } public void initializeMenu() { - topItem(_("Planification"), "/planner/index.zul"); + topItem(_("Scheduling"), "/planner/index.zul"); topItem(_("Resources"), "/resources/worker/worker.zul", subItem(_("Workers List"), @@ -179,9 +179,9 @@ public class CustomMenuController extends Div implements IMenuItemsRegister { "/workreports/workReport.zul")); topItem(_("Administration"), "/advance/advanceTypes.zul", - subItem(_("Manage advances types"), + subItem(_("Manage advance types"), "/advance/advanceTypes.zul"), - subItem(_("Manage criterions"), + subItem(_("Manage criteria"), "/resources/criterions/criterions-V2.zul"), subItem(_("Calendars"), "/calendars/calendars.zul"), subItem(_("Label types"), "/labels/labelTypes.zul")); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java index 98177764c..525e0ef51 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java @@ -869,7 +869,7 @@ public class ManageOrderElementAdvancesController extends advanceMeasurement)) { throw new WrongValueException( comp, - _("The date is not valid, the date must be unique for this advance assignment")); + _("The date is not valid, the date must be unique for this advanced assignment")); } } } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java index 94cfa49e6..857afd57d 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java @@ -247,7 +247,7 @@ class FormBinder { .get(generic); throw new WrongValueException( decimalbox, - _("there are no workers for required criterions. So the generic allocation can't be done")); + _("there are no workers for required criteria. So the generic allocation can't be done")); } public void setAllocationsList(Listbox allocationsList) { diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java index 54f446020..57149bf03 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java @@ -62,7 +62,7 @@ import org.zkoss.zkplus.databind.AnnotateDataBinder; @Scope(BeanDefinition.SCOPE_PROTOTYPE) public class MultipleTabsPlannerController implements Composer { - public static final String PLANNIFICATION = _("Plannification"); + public static final String PLANNIFICATION = _("Scheduling"); public static final String BREADCRUMBS_SEPARATOR = "/common/img/migas_separacion.gif"; diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java index c2c7aa2f9..2fab9b77d 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java @@ -225,7 +225,7 @@ public class CriterionAdminController_V2 extends GenericForwardComposer { try { criterionsModel_V2.saveCriterionType(); messagesForUser.showMessage(Level.INFO, - _("CriterionType and its criterions saved")); + _("CriterionType and its criteria saved")); } catch (ValidationException e) { for (InvalidValue invalidValue : e.getInvalidValues()) { String message = invalidValue.getPropertyName() + " : " diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java index 8b02fabc4..8484e1e58 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java @@ -351,7 +351,7 @@ public class AssignedMachineCriterionsModel implements IAssignedMachineCriterion Criterion criterion = satisfactionDTO.getCriterionWithItsType() .getCriterion(); if (checkSameCriterionAndSameInterval(satisfactionDTO)) { - throw new IllegalStateException(_("The {0} can not be assigned to this resource. Its interval overlap with other criterion", criterion.getName())); + throw new IllegalStateException(_("The {0} can not be assigned to this resource. Its interval overlaps with other criterion", criterion.getName())); } if (checkNotAllowSimultaneousCriterionsPerResource(satisfactionDTO)) { throw new IllegalStateException(_("The {0} is not valid, criterionType overlaps with other criterionSatisfaction from the same criterionType", criterion.getName())); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java index f45ce7ec0..1595fc58e 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java @@ -148,11 +148,11 @@ public class CriterionsController extends GenericForwardComposer { } if(assignedCriterionsModel.checkSameCriterionAndSameInterval(satisfaction)){ throw new WrongValueException(comp, - _("Criterion is not valid, the criterion overlap other criterionSatisfaction whith same criterion")); + _("Criterion is not valid, it overlaps other criterionSatisfaction with the same criterion")); } if(assignedCriterionsModel.checkNotAllowSimultaneousCriterionsPerResource(satisfaction)){ throw new WrongValueException(comp, - _("CriterionType is not valid, the criterionType overlap other criterionSatisfaction whith same criterionType")); + _("CriterionType is not valid, it overlaps other criterionSatisfaction with the same criterionType")); } } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerModel.java index a83159a0e..f7b0b9f3e 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerModel.java @@ -300,7 +300,7 @@ public class WorkerModel implements IWorkerModel { Validate .isTrue( type.isAllowSimultaneousCriterionsPerResource(), - _("Must allow multiple active criterions for this type to use this assignment strategy")); + _("You must allow multiple active criteria for this type to use this assignment strategy")); this.criterionDAO = criterionDAO; this.resource = resource; this.type = type; diff --git a/navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul b/navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul index b85bde7b1..5ee182882 100644 --- a/navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul +++ b/navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul @@ -108,13 +108,13 @@ diff --git a/navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul b/navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul index a84e1eaa5..fd2de0128 100644 --- a/navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul +++ b/navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul @@ -75,8 +75,8 @@ - - + + - + - @@ -181,7 +181,7 @@ - diff --git a/navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul b/navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul index d508b61df..cbc454043 100644 --- a/navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul +++ b/navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul @@ -18,7 +18,7 @@ along with this program. If not, see . --> - + diff --git a/navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul b/navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul index 62fec1af0..2d0886dd4 100644 --- a/navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul +++ b/navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul @@ -24,7 +24,7 @@ - + diff --git a/navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul b/navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul index 441a2281b..760053184 100644 --- a/navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul +++ b/navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul @@ -1,17 +1,17 @@ - +