diff --git a/libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java b/libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java index 798fc3e9a..654390131 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java +++ b/libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java @@ -241,7 +241,7 @@ public class AdvanceType extends BaseEntity implements IHumanIdentifiable{ return unitName; } - @AssertTrue(message = "the advance type name has to be unique. It is already used") + @AssertTrue(message = "Advance Type name already used. It must be unique") public boolean checkConstraintUniqueName() { if (StringUtils.isBlank(unitName)) { return true; 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 22a6fa881..c1b4e92e6 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 @@ -104,7 +104,7 @@ public class EntitySequence extends BaseEntity { return lastValue; } - @AssertTrue(message = "prefix must not contain white spaces") + @AssertTrue(message = "Prefix cannot contain whitespaces") public boolean checkConstraintPrefixWithoutWhiteSpaces() { if ((prefix == null) || (prefix.isEmpty())) { return false; diff --git a/libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialCategory.java b/libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialCategory.java index 3f670a76c..9e9a8be06 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialCategory.java +++ b/libreplan-business/src/main/java/org/libreplan/business/materials/entities/MaterialCategory.java @@ -219,7 +219,7 @@ public class MaterialCategory extends IntegrationEntity { } @SuppressWarnings("unused") - @AssertTrue(message = "The subcategories names must be unique.") + @AssertTrue(message = "Subcategory names must be unique.") public boolean checkConstraintUniqueSubcategoryName() { Set subcategoriesNames = new HashSet(); for (MaterialCategory mc : this.getAllSubcategories()) { diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLine.java b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLine.java index 1ef965d33..ded24279e 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLine.java +++ b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLine.java @@ -323,7 +323,7 @@ public class OrderLine extends OrderElement { return lastHoursGroupSequenceCode; } - @AssertTrue(message = "some code is repeated between hours group codes") + @AssertTrue(message = "Code already included in Hours Group codes") public boolean checkConstraintHoursGroupsCodeNotRepeated() { Set codes = new HashSet(); diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractorCommunication.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractorCommunication.java index f0943d55d..deb08302a 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractorCommunication.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractorCommunication.java @@ -122,4 +122,4 @@ public class SubcontractorCommunication extends BaseEntity { SubcontractorCommunicationValue value = getLastSubcontractorCommunicationValues(); return (value == null) ? null : value.getDate(); } -} \ No newline at end of file +} diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskDeadlineViolationStatusEnum.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskDeadlineViolationStatusEnum.java index fd1629141..79af1d5d4 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskDeadlineViolationStatusEnum.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskDeadlineViolationStatusEnum.java @@ -44,4 +44,4 @@ public enum TaskDeadlineViolationStatusEnum { public String toString() { return value; } -} \ No newline at end of file +} diff --git a/libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityFormItem.java b/libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityFormItem.java index 99d01d150..1f4af0470 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityFormItem.java +++ b/libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityFormItem.java @@ -66,7 +66,7 @@ public class TaskQualityFormItem implements INewObject { private Date date; - @NotEmpty(message = "task quality form item name not specified") + @NotEmpty(message = "Task Quality Form item name not specified") public String getName() { return name; } diff --git a/libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java b/libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java index cd63153ad..b31e92a2d 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java +++ b/libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java @@ -442,7 +442,7 @@ public class CriterionType extends IntegrationEntity implements } - @AssertTrue(message="criterion type name is already being used") + @AssertTrue(message="Criterion Type name is already being used") public boolean checkConstraintUniqueCriterionTypeName() { /* Check if it makes sense to check the constraint .*/ 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 d915c2781..003a4f1e2 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 @@ -492,7 +492,7 @@ public class WorkReport extends IntegrationEntity implements return true; } - @AssertTrue(message = "all timesheet lines have to be in the same month in monthly timesheets") + @AssertTrue(message = "In monthly timesheets, all timesheet lines should be in the same month") public boolean checkConstraintAllWorkReportLinesInTheSameMonthInMonthlyTimesheet() { if (!getWorkReportType().isMonthlyTimesheetsType()) { 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 eed8a84cd..47d256b55 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 @@ -420,7 +420,7 @@ public class WorkReportLine extends IntegrationEntity implements Comparable, return true; } - @AssertTrue(message = "number of hours is not properly calculated based on clock") + @AssertTrue(message = "Number of hours is not properly calculated according to start date and end date") public boolean checkConstraintHoursCalculatedByClock() { if (!firstLevelValidationsPassed()) { return true; diff --git a/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportType.java b/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportType.java index 5795ec323..cae7e4853 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportType.java +++ b/libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportType.java @@ -195,7 +195,7 @@ public class WorkReportType extends IntegrationEntity implements IHumanIdentifia } @SuppressWarnings("unused") - @AssertTrue(message = "the assigned label type can not repeat in the timeshet template.") + @AssertTrue(message = "Assigned Label Type cannot be repeated in a Timesheet Template.") public boolean checkConstraintNotExistRepeatedLabelTypes() { for (WorkReportLabelTypeAssigment assignedLabelType : this.workReportLabelTypeAssigments) { if (existRepeatedLabelType(assignedLabelType)) { @@ -532,4 +532,4 @@ public class WorkReportType extends IntegrationEntity implements IHumanIdentifia .getName()); } -} \ No newline at end of file +} diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java index 4860e8969..e620a070f 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeCRUDController.java @@ -78,7 +78,7 @@ public class AdvanceTypeCRUDController extends BaseCRUDController { if (!(advanceTypeModel.isPrecisionValid((BigDecimal) value))) { throw new WrongValueException( comp, - _("Value is not valid, the Precision value must be less than the defalt max value.")); + _("Invalid value. Precission value must be lower than the Default Max value.")); } } }; @@ -92,7 +92,7 @@ public class AdvanceTypeCRUDController extends BaseCRUDController { throws WrongValueException { if (((BigDecimal) value) == null) { throw new WrongValueException(comp, - _("Value is not valid, the default max value must not be empty ")); + _("Invalid value. Default Max Value cannot be empty")); } if (!(advanceTypeModel .isDefaultMaxValueValid((BigDecimal) value))) { 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 ae39ff035..ef3517f47 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 @@ -659,7 +659,7 @@ public class ConfigurationController extends GenericForwardComposer { private String validPrefix(EntitySequence sequence, String prefixValue) { sequence.setPrefix(prefixValue); if (!configurationModel.checkFrefixFormat(sequence)) { - String message = _("format prefix invalid. It cannot be empty or contain '_' or whitespaces."); + String message = _("Invalid format prefix. Format prefix cannot be empty, contain '_' or contain whitespaces."); if (sequence.getEntityName().canContainLowBar()) { message = _("format prefix invalid. It cannot be empty or contain whitespaces."); } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java index 02dcbe5bd..3c2b24656 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/CustomMenuController.java @@ -690,4 +690,4 @@ public class CustomMenuController extends Div implements IMenuItemsRegister { .isScenariosVisible(); } -} \ No newline at end of file +} diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/IntegrationEntityModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/IntegrationEntityModel.java index dd780cea7..48a059a06 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/IntegrationEntityModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/IntegrationEntityModel.java @@ -76,7 +76,7 @@ public abstract class IntegrationEntityModel implements IIntegrationEntityModel String code = getEntitySequenceDAO().getNextEntityCode(getEntityName()); if (code == null) { throw new ConcurrentModificationException( - _("Could not get code, please try again later")); + _("Could not retrieve Code. Please, try again later")); } getCurrentEntity().setCode(code); } @@ -124,4 +124,4 @@ public abstract class IntegrationEntityModel implements IIntegrationEntityModel return entitySequenceDAO; } -} \ No newline at end of file +} diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java index 1f5aee988..a3ac2393b 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderFilterEnum.java @@ -47,4 +47,4 @@ public enum OrderFilterEnum implements IFilterEnum { return this.description; } -} \ No newline at end of file +} diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java index 420f6e446..6db4ddb9f 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java @@ -342,7 +342,7 @@ public class CostCategoryCRUDController extends BaseCRUDController private void appendDateboxInitDate(final Row row) { Datebox initDateBox = new Datebox(); bindDateboxInitDate(initDateBox, (HourCost) row.getValue()); - initDateBox.setConstraint("no empty:" + _("The init date cannot be empty")); + initDateBox.setConstraint("no empty:" + _("Init date cannot be empty")); row.appendChild(initDateBox); initDateBox.addEventListener("onChange", new EventListener() { diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java b/libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java index bf3b5b843..107bc2e37 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/costcategories/ResourcesCostCategoryAssignmentController.java @@ -177,7 +177,7 @@ public class ResourcesCostCategoryAssignmentController extends GenericForwardCom private void appendDateboxInitDate(final Row row) { Datebox initDateBox = new Datebox(); bindDateboxInitDate(initDateBox, (ResourcesCostCategoryAssignment) row.getValue()); - initDateBox.setConstraint("no empty:" + _("The init date cannot be empty")); + initDateBox.setConstraint("no empty:" + _("Init date cannot be empty")); row.appendChild(initDateBox); initDateBox.addEventListener("onChange", new EventListener() { diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java b/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java index 6818dcbea..2ab0ef83a 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java @@ -164,7 +164,7 @@ public class DashboardController extends GenericForwardComposer { relativeMargin.doubleValue() * 100)); } else { lblAbsolute - .setValue(_("It has not been defined a project deadline")); + .setValue(_("Project Deadline not set")); } } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java b/libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java index 8872a3cd8..45c7f8fcf 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeController.java @@ -126,7 +126,7 @@ public class UnitTypeController extends BaseCRUDController { String strValue = (String) value; if (StringUtils.isBlank(strValue)) { throw new WrongValueException(comp, - _("Unit type name cannot be empty") + _("Unit Type name cannot be empty") ); } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/CriterionRequirementWrapper.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/CriterionRequirementWrapper.java index f227ef10d..b0870a39c 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/CriterionRequirementWrapper.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/CriterionRequirementWrapper.java @@ -248,4 +248,4 @@ public class CriterionRequirementWrapper implements INewObject { public boolean isOldDirectOrException() { return (!isNewDirect() && !isNewException()); } -} \ No newline at end of file +} diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/DynamicDatebox.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/DynamicDatebox.java index e7504f610..055e8c9b9 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/DynamicDatebox.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/DynamicDatebox.java @@ -146,7 +146,7 @@ public class DynamicDatebox extends GenericForwardComposer { } catch (ParseException e) { throw new WrongValueException( dateTextBox, - _("date format is wrong, please use the right format (for example for today the format would be: {0})", + _("Date format is wrong. Please, use the following format: {0}", asString(new Date()))); } } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java index 5c01cadf3..c0d332945 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java @@ -837,7 +837,7 @@ public class OrderCRUDController extends GenericForwardComposer { } else { try { - Messagebox.show(_("You don't have permissions to edit this project"), + Messagebox.show(_("Not enough permissions to edit this project"), _("Information"), Messagebox.OK, Messagebox.INFORMATION); } catch (InterruptedException e) { throw new RuntimeException(e); @@ -869,7 +869,7 @@ public class OrderCRUDController extends GenericForwardComposer { try { if (Messagebox .show( - _("This is a subcontracted project, if you delete it you can not report progress anymore. Are you sure?"), + _("This project is a subcontracted project. If you delete it, you won't be able to report progress anymore. Are you sure?"), _("Confirm"), Messagebox.OK | Messagebox.CANCEL, Messagebox.QUESTION) == Messagebox.CANCEL) { diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java index e0743fca8..edfeb451d 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java @@ -289,7 +289,7 @@ public class ProjectDetailsController extends GenericForwardComposer { setCodeAutogenerated(true); generateCode.setDisabled(true); generateCode - .setTooltiptext(_("Code has to be autogenerated to create a new project from templates")); + .setTooltiptext(_("Set Code as autogenerated to create a new project from templates")); generateCode.setChecked(true); calculateProjectDates(template); setCalendarFromTemplate(template); @@ -306,4 +306,4 @@ public class ProjectDetailsController extends GenericForwardComposer { } } -} \ No newline at end of file +} diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java index 63a17ef2a..0e184b31c 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/TreeElementOperationsController.java @@ -261,4 +261,4 @@ class OrderElementOperations extends TreeElementOperationsController 0) { - return _("It is not allowed to consolidate progress."); + return _("Progress cannot be consolidated."); } - return _("There are not any assigned progress to current task"); + return _("There is not any assigned progress to current task"); } public void setConsolidationDTOs( diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java index f3f439ac3..9e79b3d28 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java @@ -318,7 +318,7 @@ public class QualityFormCRUDController extends BaseCRUDController { .getFellowIfAny("checkBoxReportProgress"); throw new WrongValueException( checkBoxReportProgress, - _("The quality form must have an item with 100% value to report progress")); + _("Quality form should include an item with a value of 100% in order to report progress")); } } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java b/libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java index 4c6ec9f24..fd6071fd2 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/reports/CompletedEstimatedHoursPerTaskController.java @@ -133,7 +133,7 @@ public class CompletedEstimatedHoursPerTaskController extends LibrePlanReportCon .addSelectedLabel(label); if (!result) { throw new WrongValueException(bdLabels, - _("This label has already been added.")); + _("Label has already been added.")); } else { Util.reloadBindings(lbLabels); } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java b/libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java index e3b126e9d..20edc9dd1 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerController.java @@ -310,7 +310,7 @@ public class HoursWorkedPerWorkerController extends LibrePlanReportController { boolean result = hoursWorkedPerWorkerModel.addSelectedLabel(label); if (!result) { throw new WrongValueException(bdLabels, - _("This label has already been added.")); + _("Label has already been added.")); } else { Util.reloadBindings(lbLabels); } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java b/libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java index 19b1b309d..035ef5b2c 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/reports/HoursWorkedPerWorkerInAMonthController.java @@ -149,4 +149,4 @@ public class HoursWorkedPerWorkerInAMonthController extends LibrePlanReportContr return months[number - 1]; } -} \ No newline at end of file +} diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java b/libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java index b8fda5aff..0fa2f86b3 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java @@ -176,7 +176,7 @@ public class OrderCostsPerResourceController extends LibrePlanReportController { boolean result = orderCostsPerResourceModel.addSelectedLabel(label); if (!result) { throw new WrongValueException(bdLabels, - _("This label has already been added.")); + _("Label has already been added.")); } else { Util.reloadBindings(lbLabels); } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java b/libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java index 53e964826..dac3c0b50 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/reports/SchedulingProgressPerOrderController.java @@ -206,7 +206,7 @@ public class SchedulingProgressPerOrderController extends LibrePlanReportControl final Date endingDate = (Date) dbEnding.getValue(); if (endingDate != null && startingDate != null && startingDate.compareTo(endingDate) > 0) { - throw new WrongValueException(dbStarting, _("Cannot be higher than Ending date")); + throw new WrongValueException(dbStarting, _("Cannot be higher than Ending Date")); } } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java b/libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java index baf9ffbff..67a135cd8 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingArrangementsPerOrderController.java @@ -171,7 +171,7 @@ public class WorkingArrangementsPerOrderController extends LibrePlanReportContro .addSelectedLabel(label); if (!result) { throw new WrongValueException(bdLabels, - _("This label has already been added.")); + _("Label has already been added.")); } else { Util.reloadBindings(lbLabels); } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java b/libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java index 3f4bb5f60..ec1f0f468 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/reports/WorkingProgressPerTaskController.java @@ -128,7 +128,7 @@ public class WorkingProgressPerTaskController extends LibrePlanReportController .addSelectedLabel(label); if (!result) { throw new WrongValueException(bdLabels, - _("This label has already been added.")); + _("Label has already been added.")); } else { Util.reloadBindings(lbLabels); } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/scenarios/TransferOrdersModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/scenarios/TransferOrdersModel.java index 214c90629..d7db94208 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/scenarios/TransferOrdersModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/scenarios/TransferOrdersModel.java @@ -141,7 +141,7 @@ public class TransferOrdersModel implements ITransferOrdersModel { if (sourceScenario == null) { throw new ValidationException( - _("You should select a source scenario")); + _("Please select a source scenario")); } if (destinationScenario == null) { throw new ValidationException( diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/FilterCommunicationEnum.java b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/FilterCommunicationEnum.java index 06282dedf..e332390e6 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/FilterCommunicationEnum.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/FilterCommunicationEnum.java @@ -48,4 +48,4 @@ public enum FilterCommunicationEnum { public String toString() { return displayName; } -} \ No newline at end of file +} diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksModel.java index 88ed164fd..8c5503fd4 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksModel.java @@ -398,4 +398,4 @@ public class SubcontractedTasksModel implements ISubcontractedTasksModel { return xml.toString(); } -} \ No newline at end of file +} 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 8b29578f8..5c3016be9 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 @@ -308,7 +308,7 @@ public class OrderTemplatesModel implements IOrderTemplatesModel { public void validateTemplateName(String name) throws IllegalArgumentException { if ((name == null) || (name.isEmpty())) { - throw new IllegalArgumentException(_("the name cannot be empty")); + throw new IllegalArgumentException(_("name cannot be empty")); } getTemplate().setName(name); diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java b/libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java index e8cd815a1..f61855c0c 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java @@ -1076,7 +1076,7 @@ public abstract class TreeController> extends if (!getHoursGroupHandler().isTotalHoursValid(line, ((Integer) value))) { throw new WrongValueException( comp, - _("Value is not valid, taking into account the current list of HoursGroup")); + _("Value is not valid in current list of Hours Group")); } } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java index c0638f8b2..dba322373 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/users/UserCRUDController.java @@ -253,7 +253,7 @@ public class UserCRUDController extends BaseCRUDController implements userModel.initCreate(); //password is compulsory when creating passwordBox.setConstraint("no empty:" + - _("The password for a new user cannot be empty")); + _("Password cannot be empty")); //clean the password boxes, they are not cleared automatically //because they are not directly associated to an attribute passwordBox.setRawValue(""); diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java index b1c4c5717..acb867d18 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeModel.java @@ -394,7 +394,7 @@ public class WorkReportTypeModel extends IntegrationEntityModel implements throws IllegalArgumentException { if ((name == null) || (name.isEmpty())) { throw new IllegalArgumentException( - _("the name cannot be empty")); + _("name cannot be empty")); } getWorkReportType().setName(name); diff --git a/libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul b/libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul index 248848b05..e6ee57035 100644 --- a/libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul +++ b/libreplan-webapp/src/main/webapp/calendars/_createNewVersion.zul @@ -20,7 +20,7 @@ --> @@ -60,4 +60,4 @@ sclass="cancel-button global-action"/> - \ No newline at end of file + diff --git a/libreplan-webapp/src/main/webapp/calendars/_edition.zul b/libreplan-webapp/src/main/webapp/calendars/_edition.zul index b42c37a0c..49518640d 100644 --- a/libreplan-webapp/src/main/webapp/calendars/_edition.zul +++ b/libreplan-webapp/src/main/webapp/calendars/_edition.zul @@ -234,7 +234,7 @@