From d59577a5685ff559b9ea90414f68c3d8576f9493 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Mon, 2 Jul 2012 19:37:31 +0200 Subject: [PATCH] i18n: Review and fix several strings to be translated FEA: ItEr76S04BugFixing --- .../calendars/entities/BaseCalendar.java | 2 +- .../entities/ConfigurationRolesLDAP.java | 2 +- .../common/entities/EntitySequence.java | 8 ++------ .../costcategories/entities/CostCategory.java | 2 +- .../business/labels/entities/LabelType.java | 2 +- .../entities/CriterionRequirementHandler.java | 2 +- .../business/orders/entities/HoursGroup.java | 7 +++---- .../orders/entities/HoursGroupHandler.java | 8 +++----- .../business/orders/entities/Order.java | 2 +- .../business/orders/entities/OrderElement.java | 4 ++-- .../orders/entities/SchedulingState.java | 9 ++++----- .../planner/entities/StretchesFunction.java | 2 +- .../planner/entities/SubcontractState.java | 2 +- .../business/planner/entities/TaskGroup.java | 2 +- .../planner/entities/TaskMilestone.java | 2 +- .../ResourcesPerDayModification.java | 2 +- .../limiting/entities/QueuePosition.java | 2 +- .../qualityforms/entities/QualityForm.java | 2 +- .../entities/CriterionSatisfaction.java | 6 +++--- .../business/resources/entities/Resource.java | 2 +- .../business/resources/entities/Worker.java | 2 +- .../entities/OrderElementTemplate.java | 2 +- .../entities/HoursManagementEnum.java | 2 +- .../workreports/entities/WorkReport.java | 6 +++--- .../workreports/entities/WorkReportLine.java | 2 +- .../calendars/BaseCalendarCRUDController.java | 2 +- .../web/calendars/BaseCalendarModel.java | 2 +- .../web/common/ConfigurationController.java | 2 +- .../web/common/ConfigurationModel.java | 2 +- .../web/montecarlo/MonteCarloController.java | 4 ++-- .../ManageOrderElementAdvancesController.java | 10 +++++----- .../materials/AssignedMaterialsController.java | 2 +- .../web/planner/TaskElementAdapter.java | 2 +- .../ResourceAllocationController.java | 2 +- .../streches/StretchesFunctionModel.java | 3 +-- .../planner/company/CompanyPlanningModel.java | 2 +- .../web/planner/order/OrderPlanningModel.java | 2 +- .../criterion/CriterionAdminController.java | 4 ++-- .../criterion/CriterionTreeModel.java | 2 +- .../worker/WorkRelationshipsController.java | 2 +- .../subcontract/ReportAdvancesController.java | 2 +- .../SubcontractedTasksController.java | 2 +- .../templates/OrderTemplatesController.java | 4 ++-- .../web/templates/OrderTemplatesModel.java | 2 +- .../web/templates/TemplatesTreeComponent.java | 4 ++-- .../WorkReportTypeCRUDController.java | 18 ++++++------------ .../main/webapp/expensesheet/expenseSheet.zul | 2 +- .../externalcompanies/_editExternalCompany.zul | 2 +- .../resources/criterions/_criterionsTree.zul | 2 +- .../main/webapp/resources/criterions/_list.zul | 2 +- .../machine/_machineConfigurationUnits.zul | 2 +- .../subcontract/customerCommunications.zul | 2 +- .../subcontractorCommunications.zul | 2 +- 53 files changed, 79 insertions(+), 94 deletions(-) diff --git a/libreplan-business/src/main/java/org/libreplan/business/calendars/entities/BaseCalendar.java b/libreplan-business/src/main/java/org/libreplan/business/calendars/entities/BaseCalendar.java index f5fcef123..85d2183c4 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/calendars/entities/BaseCalendar.java +++ b/libreplan-business/src/main/java/org/libreplan/business/calendars/entities/BaseCalendar.java @@ -1091,7 +1091,7 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar, } @SuppressWarnings("unused") - @AssertTrue(message = "the work week: the dates should be corrects and sorted and could not overlap ") + @AssertTrue(message = "dates must be sorted and cannot overlap") public boolean checkConstraintDateCouldNotOverlap() { if (calendarDataVersions == null || calendarDataVersions.isEmpty()) { diff --git a/libreplan-business/src/main/java/org/libreplan/business/common/entities/ConfigurationRolesLDAP.java b/libreplan-business/src/main/java/org/libreplan/business/common/entities/ConfigurationRolesLDAP.java index b7650678f..a1c4c4b94 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/common/entities/ConfigurationRolesLDAP.java +++ b/libreplan-business/src/main/java/org/libreplan/business/common/entities/ConfigurationRolesLDAP.java @@ -53,7 +53,7 @@ public class ConfigurationRolesLDAP { return roleLdap; } - @NotEmpty(message = "role libreplan not specified") + @NotEmpty(message = "LibrePlan role not specified") public String getRoleLibreplan() { return roleLibreplan; } diff --git a/libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java b/libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java index 69a58b49a..f89e85148 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java +++ b/libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java @@ -85,9 +85,7 @@ public class EntitySequence extends BaseEntity { public void setPrefix(String prefix) throws IllegalArgumentException { if (isAlreadyInUse()) { - throw new IllegalArgumentException( - I18nHelper - ._("You can not modifiy this entity sequence, it is already in use")); + throw new IllegalArgumentException("You cannot modifiy this entity sequence, it is already in use"); } this.prefix = prefix; @@ -126,9 +124,7 @@ public class EntitySequence extends BaseEntity { public void setNumberOfDigits(Integer numberOfDigits) throws IllegalArgumentException { if (isAlreadyInUse()) { - throw new IllegalArgumentException( - I18nHelper - ._("You can not modifiy this entity sequence, it is already in use")); + throw new IllegalArgumentException("You cannot modifiy this entity sequence, it is already in use"); } if ((numberOfDigits != null) diff --git a/libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java b/libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java index b826e9d51..702a44274 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java +++ b/libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/CostCategory.java @@ -319,7 +319,7 @@ public class CostCategory extends IntegrationEntity implements IHumanIdentifiabl return name; } - @AssertTrue(message = "the cost category name has to be unique. It is already used") + @AssertTrue(message = "the cost category name has to be unique and it is already in use") public boolean checkConstraintUniqueName() { if (StringUtils.isBlank(name)) { return true; diff --git a/libreplan-business/src/main/java/org/libreplan/business/labels/entities/LabelType.java b/libreplan-business/src/main/java/org/libreplan/business/labels/entities/LabelType.java index ec5e23344..1a4264265 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/labels/entities/LabelType.java +++ b/libreplan-business/src/main/java/org/libreplan/business/labels/entities/LabelType.java @@ -124,7 +124,7 @@ public class LabelType extends IntegrationEntity implements Comparable, return true; } - @AssertTrue(message = "label type name is already being used") + @AssertTrue(message = "label type name is already in use") public boolean checkConstraintUniqueLabelTypeName() { if (!firstLevelValidationsPassed()) { return true; diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/CriterionRequirementHandler.java b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/CriterionRequirementHandler.java index ccfafd29a..096462abf 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/CriterionRequirementHandler.java +++ b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/CriterionRequirementHandler.java @@ -536,7 +536,7 @@ public abstract class CriterionRequirementHandler { newRequirement); } else { throw new IllegalStateException( - _("The criterion already exist into other task")); + _("The criterion already exists into another task")); } } diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/HoursGroup.java b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/HoursGroup.java index 6353ff0e1..6caaa85d7 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/HoursGroup.java +++ b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/HoursGroup.java @@ -176,8 +176,7 @@ public class HoursGroup extends IntegrationEntity implements Cloneable, public void setWorkingHours(Integer workingHours) throws IllegalArgumentException { if ((workingHours != null) && (workingHours < 0)) { - throw new IllegalArgumentException( - _("Working hours shouldn't be negative")); + throw new IllegalArgumentException("Working hours should not be negative"); } if (workingHours == null) { workingHours = 0; @@ -254,11 +253,11 @@ public class HoursGroup extends IntegrationEntity implements Cloneable, public void addCriterionRequirement(CriterionRequirement requirement) { if (!isValidResourceType(requirement)) { throw new IllegalStateException( - _("The criterion can not be assigned to this hoursGroup because its resource type is diferent")); + "The criterion can not be assigned to this hoursGroup because its resource type is diferent"); } if (existSameCriterionRequirement(requirement)) { throw new IllegalStateException( - _("The criterion can not be assigned to this hoursGroup because it already exist into the hoursGroup")); + "The criterion can not be assigned to this hoursGroup because it already exist into the hoursGroup"); } requirement.setHoursGroup(this); diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/HoursGroupHandler.java b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/HoursGroupHandler.java index 6b0477aa2..36cb7e53b 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/HoursGroupHandler.java +++ b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/HoursGroupHandler.java @@ -21,8 +21,6 @@ package org.libreplan.business.orders.entities; -import static org.libreplan.business.i18n.I18nHelper._; - import java.math.BigDecimal; import java.util.HashSet; import java.util.Set; @@ -257,7 +255,7 @@ public abstract class HoursGroupHandler implements IHoursGroupHandler { if (workHours < 0) { throw new IllegalArgumentException( - _("workHours should be greater or equals to 0")); + "workHours should be greater or equals to 0"); } if (hoursGroupsIsEmpty(orderLine)) { @@ -269,8 +267,8 @@ public abstract class HoursGroupHandler implements IHoursGroupHandler { if (!isTotalHoursValid(workHours, getHoursGroup(orderLine))) { throw new IllegalArgumentException( - _("\"workHours\" value is not valid, taking into " - + "account the current list of HoursGroup")); + "\"workHours\" value is not valid, taking into " + + "account the current list of HoursGroup"); } updateHoursGroups(orderLine, workHours); diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/Order.java b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/Order.java index 249351ccc..b60c4354f 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/Order.java +++ b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/Order.java @@ -346,7 +346,7 @@ public class Order extends OrderLineGroup implements Comparable { } @SuppressWarnings("unused") - @AssertTrue(message = "the order must have a init date") + @AssertTrue(message = "the order must have a start date") private boolean ifSchedulingModeIsForwardOrderMustHaveStartDate() { return getSchedulingMode() != SchedulingMode.FORWARD || getInitDate() != null; diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java index a5fdb7563..d355da7c7 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java +++ b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java @@ -659,8 +659,8 @@ public abstract class OrderElement extends IntegrationEntity implements if (!checkAncestorsNoOtherLabelRepeated(label)) { throw new IllegalArgumentException( - _("Some ancestor has the same label assigned, " - + "so this element is already inheriting this label")); + "An ancestor has the same label assigned, " + + "so this element is already inheriting this label"); } removeLabelOnChildren(label); diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingState.java b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingState.java index a4edb33b9..d7041fcd7 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingState.java +++ b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingState.java @@ -211,8 +211,7 @@ public class SchedulingState { public void schedule() { if (!canBeScheduled()) { - throw new IllegalStateException( - _("it's already somewhat scheduled")); + throw new IllegalStateException("It is already somewhat scheduled"); } setType(Type.SCHEDULING_POINT); for (SchedulingState schedulingState : getDescendants()) { @@ -226,7 +225,7 @@ public class SchedulingState { public void unschedule() { if (!canBeUnscheduled()) { - throw new IllegalStateException(_("it can't be unscheduled")); + throw new IllegalStateException("It cannot be unscheduled"); } setType(Type.NO_SCHEDULED); markDescendantsAsNoScheduled(); @@ -364,7 +363,7 @@ public class SchedulingState { public String getStateName() { if (isCompletelyScheduled()) { - return _("Completely scheduled"); + return _("Fully scheduled"); } else if (isPartiallyScheduled()) { return _("Partially scheduled"); } else { @@ -374,7 +373,7 @@ public class SchedulingState { public String getStateAbbreviation() { if (isCompletelyScheduled()) { - return _("C"); + return _("F"); } else if (isPartiallyScheduled()) { return _("P"); } else { diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/StretchesFunction.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/StretchesFunction.java index 52dc2a615..9d6a4002a 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/StretchesFunction.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/StretchesFunction.java @@ -312,7 +312,7 @@ public class StretchesFunction extends AssignmentFunction { return getStretchesPlusConsolidated().size() > 2; } - @AssertTrue(message = "Some stretch has lower or equal values than the " + @AssertTrue(message = "A stretch has lower or equal values than the " + "previous stretch") public boolean checkStretchesOrder() { List stretchesPlusConsolidated = getStretchesPlusConsolidated(); diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractState.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractState.java index dfaaa740b..27001cde8 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractState.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractState.java @@ -51,4 +51,4 @@ public enum SubcontractState { return sendable; } -} \ No newline at end of file +} diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskGroup.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskGroup.java index 0edfd3817..b30266641 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskGroup.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskGroup.java @@ -107,7 +107,7 @@ public class TaskGroup extends TaskElement { } @SuppressWarnings("unused") - @AssertTrue(message = "order element associated to a task group must be not null") + @AssertTrue(message = "order element associated to a task group have to be defined") private boolean theOrderElementMustBeNotNull() { return getOrderElement() != null; } diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskMilestone.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskMilestone.java index 2583920f4..068e7f3df 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskMilestone.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskMilestone.java @@ -119,7 +119,7 @@ public class TaskMilestone extends TaskElement implements ITaskPositionConstrain } @SuppressWarnings("unused") - @AssertTrue(message = "order element associated to a milestone must be null") + @AssertTrue(message = "a milestone cannot have a task associated") private boolean theOrderElementMustBeNull() { return getOrderElement() == null; } diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java index 5a39450fe..eb6e77eda 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/allocationalgorithms/ResourcesPerDayModification.java @@ -93,7 +93,7 @@ public abstract class ResourcesPerDayModification extends @Override public String getNoValidPeriodsMessage() { String firstLine = _("There are no days available due to not satisfying the criteria."); - String secondLine = _("Another possibility is that the resources don't have days available due to their calendars."); + String secondLine = _("Another possibility is that the resources do not have days available due to their calendars."); return firstLine + "\n" + secondLine; } diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/QueuePosition.java b/libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/QueuePosition.java index db7c8271f..1a0cf6f9d 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/QueuePosition.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/limiting/entities/QueuePosition.java @@ -50,7 +50,7 @@ public class QueuePosition { } public void setHour(int hour) { - Validate.isTrue(hour >= 0 && hour <= 23, _("Hour should be a value between 0 and 23")); + Validate.isTrue(hour >= 0 && hour <= 23, _("Hour should be between 0 and 23")); this.hour = hour; } diff --git a/libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java b/libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java index e0d401b01..6f570213b 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java +++ b/libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java @@ -263,7 +263,7 @@ public class QualityForm extends BaseEntity implements IHumanIdentifiable{ } @SuppressWarnings("unused") - @AssertTrue(message = "The quality form item porcentage must be unique if the quality form type is by percentage.") + @AssertTrue(message = "percentages in quality form items must be unique") public boolean checkConstraintDuplicatesQualityFormItemPercentage() { if ((qualityFormType != null) && (qualityFormType.equals(QualityFormType.BY_PERCENTAGE)) diff --git a/libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionSatisfaction.java b/libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionSatisfaction.java index dcfd06eca..1fe8ff2b7 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionSatisfaction.java +++ b/libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionSatisfaction.java @@ -190,7 +190,7 @@ public class CriterionSatisfaction extends IntegrationEntity { return result; } - @NotNull(message="criterion satisfaction's start date not specified") + @NotNull(message="start date not specified") public LocalDate getStartDate() { return startDate; } @@ -203,7 +203,7 @@ public class CriterionSatisfaction extends IntegrationEntity { return Interval.range(startDate, finishDate); } - @NotNull(message="criterion satisfaction's criterion not specified") + @NotNull(message="criterion not specified") public Criterion getCriterion() { return criterion; } @@ -212,7 +212,7 @@ public class CriterionSatisfaction extends IntegrationEntity { this.criterion = criterion; } - @NotNull(message="criterion satisfaction's resource not specified") + @NotNull(message="resource not specified") public Resource getResource() { return resource; } diff --git a/libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java b/libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java index cd1bd7504..c35d3f0c5 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java +++ b/libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java @@ -1146,7 +1146,7 @@ public abstract class Resource extends IntegrationEntity implements return getFirstRepeatedCode(criterionSatisfactions) == null; } - @AssertTrue(message="resources cost category assignment codes must be " + + @AssertTrue(message="resource cost category assignments codes must be " + "unique inside a resource") public boolean checkConstraintNonRepeatedResourcesCostCategoryAssignmentCodes() { return getFirstRepeatedCode(resourcesCostCategoryAssignments) == null; diff --git a/libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java b/libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java index 96d140149..e12d9378f 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java +++ b/libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java @@ -268,7 +268,7 @@ public class Worker extends Resource { } } - @AssertTrue(message = "Bound user has proper role") + @AssertTrue(message = "Bound user does not have the proper role") public boolean checkConstraintBoundUserHaveProperRole() { if (user == null) { return true; diff --git a/libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderElementTemplate.java b/libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderElementTemplate.java index 9f4c3aaf6..2d350f74a 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderElementTemplate.java +++ b/libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderElementTemplate.java @@ -454,7 +454,7 @@ public abstract class OrderElementTemplate extends BaseEntity implements return getParent() == null; } - @AssertTrue(message = "template name is already being used") + @AssertTrue(message = "template name is already in use") public boolean checkConstraintUniqueRootTemplateName() { if (getParent() != null) { return true; diff --git a/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/HoursManagementEnum.java b/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/HoursManagementEnum.java index 1a1a12665..50697e6fb 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/HoursManagementEnum.java +++ b/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/HoursManagementEnum.java @@ -30,7 +30,7 @@ public enum HoursManagementEnum { 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")); + NUMBER_OF_HOURS_AND_CLOCK(_("Number of assigned hours and time")); private String description; diff --git a/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java b/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java index 8781f6b5e..3f6cedd30 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java +++ b/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java @@ -220,7 +220,7 @@ public class WorkReport extends IntegrationEntity implements } @SuppressWarnings("unused") - @AssertTrue(message = "date:the date must be not null if is shared by lines") + @AssertTrue(message = "date cannot be empty if it is shared by lines") public boolean checkConstraintDateMustBeNotNullIfIsSharedByLines() { if (!firstLevelValidationsPassed()) { return true; @@ -233,7 +233,7 @@ public class WorkReport extends IntegrationEntity implements } @SuppressWarnings("unused") - @AssertTrue(message = "resource:the resource must be not null if is shared by lines") + @AssertTrue(message = "resource cannot be empty if it is shared by lines") public boolean checkConstraintResourceMustBeNotNullIfIsSharedByLines() { if (!firstLevelValidationsPassed()) { return true; @@ -246,7 +246,7 @@ public class WorkReport extends IntegrationEntity implements } @SuppressWarnings("unused") - @AssertTrue(message = "orderElement:the order element must be not null if is shared by lines") + @AssertTrue(message = "task cannot be empty if it is shared by lines") public boolean checkConstraintOrderElementMustBeNotNullIfIsSharedByLines() { if (!firstLevelValidationsPassed()) { return true; diff --git a/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java b/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java index e6f5917e0..eed8a84cd 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java +++ b/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportLine.java @@ -258,7 +258,7 @@ public class WorkReportLine extends IntegrationEntity implements Comparable, return true; } - @AssertTrue(message = "clockFinish:the clockStart must be not null if number of hours is calcultate by clock") + @AssertTrue(message = "clock finish cannot be empty if number of hours is calcultate by clock") public boolean checkConstraintClockFinishMustBeNotNullIfIsCalculatedByClock() { if (!firstLevelValidationsPassed()) { return true; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java index 1dbde8f3d..eda8a8001 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarCRUDController.java @@ -426,7 +426,7 @@ public class BaseCalendarCRUDController extends GenericForwardComposer { .showMessage( Level.ERROR, _("Default calendar cannot be removed. " - + "Please, change the default calendar in the Configuration window before.")); + + "Please, change the default calendar in the Main Settings window before.")); return; } removeCalendar(calendar); diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java index 038c6df79..b52486d02 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java @@ -603,7 +603,7 @@ public class BaseCalendarModel extends IntegrationEntityModel implements "{0} already exists", entity.getName()), BaseCalendar.class, "name", entity.getName(), entity) }; throw new ValidationException(invalidValues2, - _("Could not save new calendar")); + _("Could not save the new calendar")); } } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java index 7709d16c9..ae39ff035 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java @@ -494,7 +494,7 @@ public class ConfigurationController extends GenericForwardComposer { appendOperations(row, entitySequence); if (entitySequence.isAlreadyInUse()) { - row.setTooltiptext(_("The code sequence is already in use and it can not be updated.")); + row.setTooltiptext(_("Code sequence is already in use and cannot be updated")); } if ((row.getPreviousSibling() != null) diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java index f914fc961..fe157da77 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java @@ -231,7 +231,7 @@ public class ConfigurationModel implements IConfigurationModel { entitySequenceDAO.remove(entitySequence); } catch (InstanceNotFoundException e) { throw new ValidationException( - _("Some sequences to be removed does not exist")); + _("Some sequences to be removed do not exist")); } catch (IllegalArgumentException e) { throw new ValidationException(e.getMessage()); } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/montecarlo/MonteCarloController.java b/libreplan-webapp/src/main/java/org/libreplan/web/montecarlo/MonteCarloController.java index 2d0765e01..ec2ed2a4d 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/montecarlo/MonteCarloController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/montecarlo/MonteCarloController.java @@ -160,8 +160,8 @@ public class MonteCarloController extends GenericForwardComposer { } if (iterations < 0 || iterations > MAX_NUMBER_ITERATIONS) { throw new WrongValueException(ibIterations, - _("Number of iterations should be between 1 and " - + MAX_NUMBER_ITERATIONS)); + _("Number of iterations should be between 1 and {0}", + MAX_NUMBER_ITERATIONS)); } return iterations; } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java index 5b9825d91..f3d1a4684 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java @@ -747,7 +747,7 @@ public class ManageOrderElementAdvancesController extends .hasConsolidatedAdvances(advance)) { removeButton.setDisabled(true); removeButton - .setTooltiptext(_("Consolidated progress can not be removed")); + .setTooltiptext(_("Consolidated progress cannot be removed")); } else if (readOnly) { removeButton.setDisabled(true); removeButton @@ -1222,7 +1222,7 @@ public class ManageOrderElementAdvancesController extends } else if (advance.isFake()) { removeButton.setDisabled(true); removeButton - .setTooltiptext(_("Calculated progress measurement can not be removed")); + .setTooltiptext(_("Calculated progress measurements cannot be removed")); } else if (manageOrderElementAdvancesModel .hasConsolidatedAdvances(measure)) { removeButton.setDisabled(true); @@ -1302,9 +1302,9 @@ public class ManageOrderElementAdvancesController extends } private void showMessagesConsolidation(LocalDate date) { - String message = _("This progress measurement can not be in " - + date - + ", because it is consolidated. it is necessary to select other date."); + String message = _( + "Progress measurement cannot be canged to {0}, because it is consolidated", + date); showErrorMessage(message); } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java index 95bb541d4..95b7d7b28 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/materials/AssignedMaterialsController.java @@ -456,7 +456,7 @@ public abstract class AssignedMaterialsController extends GenericForwardCo public void showSplitMaterialAssignmentDlg(A materialAssignment) { MessageboxDlg dialogSplitAssignment; - final String message = _("Create new material assignment out of material assignment {0}. Are you sure?", + final String message = _("Do you want to split the material assignment {0}?", getMaterial(materialAssignment).getCode()); Map args = new HashMap(); diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java index 32a94416b..993ec8e81 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java @@ -1073,7 +1073,7 @@ public class TaskElementAdapter { .append("
"); result.append( _( - "cost because of worked hours: {0}, cost because of expenses: {1}", + "hours cost: {0}, expenses cost: {1}", costHours, costExpenses)); } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java index b744e3a4a..e3045f3b6 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java @@ -622,7 +622,7 @@ public class ResourceAllocationController extends GenericForwardComposer { private void renderAggregatingRow(Row row) { ResourceAllocationController controller = ResourceAllocationController.this; append(row, new Label()); - append(row, new Label(_("Sum of all rows"))); + append(row, new Label(_("Total"))); append(row, allOriginalEffort); append(row, allTotalEffort); append(row, allConsolidatedEffort); diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java index 060ca8d6d..6489a301a 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/streches/StretchesFunctionModel.java @@ -174,8 +174,7 @@ public class StretchesFunctionModel implements IStretchesFunctionModel { } if (!stretchesFunction.checkOneHundredPercent()) { throw new ValidationException( - _("Last stretch should have one hundred percent for " - + "length and amount of work percentage")); + _("Last stretch should have 100% for length and amount of work")); } if (stretchesFunction.isInterpolated()) { if (!stretchesFunction.checkHasAtLeastTwoStretches()) { diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java index 84f04960f..7882b5709 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java @@ -359,7 +359,7 @@ public class CompanyPlanningModel implements ICompanyPlanningModel { Date today = LocalDate.fromDateFields(new Date()) .toDateTimeAtStartOfDay().toDate(); if (value != null && (value.compareTo(today) > 0)) { - throw new WrongValueException(datebox, _("date in future")); + throw new WrongValueException(datebox, _("date in the future")); } } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java index 83451bf6f..e2653db50 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java @@ -763,7 +763,7 @@ public class OrderPlanningModel implements IOrderPlanningModel { Date today = LocalDate.fromDateFields(new Date()) .toDateTimeAtStartOfDay().toDate(); if (value != null && (value.compareTo(today) > 0)) { - throw new WrongValueException(datebox, _("date in future")); + throw new WrongValueException(datebox, _("date in the future")); } } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java b/libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java index 5b6334a75..848812a6b 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java @@ -211,7 +211,7 @@ public class CriterionAdminController extends BaseCRUDController try { setupCriterionTreeController(editWindow); } catch (Exception e) { - LOG.error("Error setting up creationg form for Criterion Type", e); + LOG.error("Error setting up creating form for Criterion Type", e); } setResourceComboboxValue((Combobox) editWindow .getFellowIfAny("resourceCombobox")); @@ -254,7 +254,7 @@ public class CriterionAdminController extends BaseCRUDController messagesForUser .showMessage( Level.WARNING, - _("This criterion type cannot be deleted because it has assignments to projects or resources")); + _("This criterion type cannot be deleted because it is assigned to projects or resources")); return false; } return true; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeModel.java index d6c789c9f..944909092 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeModel.java @@ -327,7 +327,7 @@ public class CriterionTreeModel implements ICriterionTreeModel { for(CriterionDTO criterion : criterions){ if(criterion.getName().equals(name)){ InvalidValue[] invalidValues = { - new InvalidValue(_("Already exists other " + + new InvalidValue(_("Already exists another " + "criterion with the same name"), Criterion.class, "name", criterion.getName(), criterion)}; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkRelationshipsController.java b/libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkRelationshipsController.java index 763fba065..96f4c17d9 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkRelationshipsController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkRelationshipsController.java @@ -133,7 +133,7 @@ public class WorkRelationshipsController extends GenericForwardComposer { } i++; } - throw new RuntimeException(_("Couldn't find criterion {0}", criterion)); + throw new RuntimeException("Could not find the criterion " + criterion); } public void saveCriterionSatisfaction() { diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ReportAdvancesController.java b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ReportAdvancesController.java index 6a0ad6a37..80b4b6deb 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ReportAdvancesController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ReportAdvancesController.java @@ -163,7 +163,7 @@ public class ReportAdvancesController extends GenericForwardComposer { private Button getExportButton( final Order order) { - Button exportButton = new Button(_("XML")); + Button exportButton = new Button("XML"); exportButton.addEventListener(Events.ON_CLICK, new EventListener() { IServletRequestHandler requestHandler = new IServletRequestHandler() { diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java index 231141702..6cfb82807 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java @@ -181,7 +181,7 @@ public class SubcontractedTasksController extends GenericForwardComposer { private Button getExportButton( final SubcontractedTaskData subcontractedTaskData) { - Button exportButton = new Button(_("XML")); + Button exportButton = new Button("XML"); exportButton.addEventListener(Events.ON_CLICK, new EventListener() { IServletRequestHandler requestHandler = new IServletRequestHandler() { diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java b/libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java index 2167202f8..9b2407fce 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java @@ -374,7 +374,7 @@ public class OrderTemplatesController extends GenericForwardComposer implements */ public void confirmDelete(OrderElementTemplate template) { try { - if (Messagebox.show(_("Delete project template. Are you sure?"), + if (Messagebox.show(_("Delete template. Are you sure?"), _("Confirm"), Messagebox.OK | Messagebox.CANCEL, Messagebox.QUESTION) == Messagebox.OK) { if (this.model.hasNotApplications(template)) { @@ -388,7 +388,7 @@ public class OrderTemplatesController extends GenericForwardComposer implements messagesForUser .showMessage( Level.ERROR, - _("This template can not be removed because it has applications.")); + _("Template cannot be removed because it has applications")); } } } catch (InterruptedException e) { diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesModel.java index c5f76500a..8b29578f8 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesModel.java @@ -314,7 +314,7 @@ public class OrderTemplatesModel implements IOrderTemplatesModel { getTemplate().setName(name); if (!getTemplate().checkConstraintUniqueRootTemplateName()) { throw new IllegalArgumentException( - _("Already exists other template with the same name")); + _("Already exists another template with the same name")); } } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java b/libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java index 9e6c3de8b..44216b16d 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java @@ -97,7 +97,7 @@ public class TemplatesTreeComponent extends TreeComponent { }); result.add(new TemplatesTreeColumn( - _("Must start after (days since beginning project)"), + _("Must start after (days since project start)"), "estimated_init") { @Override @@ -108,7 +108,7 @@ public class TemplatesTreeComponent extends TreeComponent { }); result.add(new TemplatesTreeColumn( - _("Deadline (days since beggining project)"), + _("Deadline (days since project start)"), "estimated_end") { @Override diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java index 9e7632f4f..a3b3fb2fa 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java @@ -335,16 +335,10 @@ public class WorkReportTypeCRUDController extends BaseCRUDController - +
diff --git a/libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul b/libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul index d251c2de9..a376c3d42 100644 --- a/libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul +++ b/libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul @@ -82,7 +82,7 @@ - diff --git a/libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul b/libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul index d84e011d7..665cef39c 100644 --- a/libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul +++ b/libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul @@ -20,7 +20,7 @@ --> - + diff --git a/libreplan-webapp/src/main/webapp/resources/criterions/_list.zul b/libreplan-webapp/src/main/webapp/resources/criterions/_list.zul index e73cc9877..32578dfd4 100644 --- a/libreplan-webapp/src/main/webapp/resources/criterions/_list.zul +++ b/libreplan-webapp/src/main/webapp/resources/criterions/_list.zul @@ -19,7 +19,7 @@ along with this program. If not, see . --> - + diff --git a/libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul b/libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul index 683f0cd05..5a171998e 100644 --- a/libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul +++ b/libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul @@ -30,7 +30,7 @@ diff --git a/libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul b/libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul index fcc37f89a..cc27af47a 100644 --- a/libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul +++ b/libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul @@ -34,7 +34,7 @@
-