diff --git a/libreplan-business/src/main/java/org/libreplan/business/resources/entities/ResourceType.java b/libreplan-business/src/main/java/org/libreplan/business/resources/entities/ResourceType.java index 88c015517..10940af8e 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/resources/entities/ResourceType.java +++ b/libreplan-business/src/main/java/org/libreplan/business/resources/entities/ResourceType.java @@ -30,9 +30,9 @@ import java.util.Set; */ public enum ResourceType { - NON_LIMITING_RESOURCE(_("NON LIMITING RESOURCE")), - LIMITING_RESOURCE(_("LIMITING RESOURCE")), - STRATEGIC_RESOURCE(_("STRATEGIC RESOURCE")); + NON_LIMITING_RESOURCE(_("Normal resource")), + LIMITING_RESOURCE(_("Queue-based resource")), + STRATEGIC_RESOURCE(_("Strategic resource")); private String option; 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 e12d9378f..ccc62b77e 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 @@ -245,7 +245,7 @@ public class Worker extends Resource { return getId().equals(worker.getId()); } - @AssertTrue(message = "Limiting resources cannot be bound to any user") + @AssertTrue(message = "Queue-based resources cannot be bound to any user") public boolean checkConstraintLimitingResourceNotBoundToUser() { if (isLimitingResource()) { return user == null; 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 3c2b24656..4b2e9a5e0 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 @@ -281,7 +281,7 @@ public class CustomMenuController extends Div implements IMenuItemsRegister { globalView.goToCompanyLoad(); } }, "01-introducion.html#id1")); - planningItems.add(subItem(_("Limiting Resources"), new ICapture() { + planningItems.add(subItem(_("Queue-based Resources"), new ICapture() { @Override public void capture() { globalView.goToLimitingResources(); diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/ResourceAllocationBehaviour.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/ResourceAllocationBehaviour.java index b8006ef31..c0f6ab7cd 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/components/ResourceAllocationBehaviour.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/components/ResourceAllocationBehaviour.java @@ -35,7 +35,7 @@ import org.libreplan.web.common.components.NewAllocationSelector.AllocationType; */ public enum ResourceAllocationBehaviour { - NON_LIMITING(_("NON_LIMITING")) { + NON_LIMITING(_("Normal")) { @Override public boolean allowMultipleSelection() { @@ -60,7 +60,7 @@ public enum ResourceAllocationBehaviour { } }, - LIMITING(_("LIMITING")) { + LIMITING(_("Queue-based")) { @Override public boolean allowMultipleSelection() { diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java b/libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java index e7ae8cd0e..d1a80bbdd 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java @@ -442,7 +442,7 @@ public class LimitingResourcesController extends GenericForwardComposer { Button result = new Button("", "/common/img/ico_editar1.png"); result.setHoverImage("/common/img/ico_editar.png"); result.setSclass("icono"); - result.setTooltiptext(_("Edit limiting resource element")); + result.setTooltiptext(_("Edit queue-based resource element")); result.addEventListener(Events.ON_CLICK, new EventListener() { @Override @@ -476,7 +476,7 @@ public class LimitingResourcesController extends GenericForwardComposer { Button result = new Button("", "/common/img/ico_borrar1.png"); result.setHoverImage("/common/img/ico_borrar.png"); result.setSclass("icono"); - result.setTooltiptext(_("Remove limiting resource element")); + result.setTooltiptext(_("Remove queue-based resource element")); result.addEventListener(Events.ON_CLICK, new EventListener() { @Override diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java index cdf54ebf8..04ac6415d 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AdvancedAllocationController.java @@ -1198,7 +1198,7 @@ class Row { if (isGroupingRow()) { return new Label(); } else if (isLimiting) { - return new Label(_("Limiting assignment")); + return new Label(_("Queue-based assignment")); } else { if (hboxAssigmentFunctionsCombo == null) { initializeAssigmentFunctionsCombo(); diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/limiting/allocation/LimitingResourceAllocationModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/limiting/allocation/LimitingResourceAllocationModel.java index e48970975..bf7829a89 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/limiting/allocation/LimitingResourceAllocationModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/limiting/allocation/LimitingResourceAllocationModel.java @@ -219,7 +219,7 @@ public class LimitingResourceAllocationModel implements ILimitingResourceAllocat if (!areAllLimitingResources(resources)) { getMessagesForUser().showMessage(Level.ERROR, - _("All resources must be limiting. ")); + _("All resources must be queue-based")); return; } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java index e1829bd59..19f801c07 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java @@ -44,7 +44,7 @@ import org.zkoss.zul.Label; public class LimitingResourcesTabCreator { /* Unnecesary */ - private String ORDER_LIMITING_RESOURCES_VIEW = _("Limiting resources (project)"); + private String ORDER_LIMITING_RESOURCES_VIEW = _("Queue-based resources (project)"); public static ITab create(Mode mode, LimitingResourcesController LimitingResourcesController, @@ -132,7 +132,7 @@ public class LimitingResourcesTabCreator { } }; - return new CreatedOnDemandTab(_("Limiting Resources Planning"), + return new CreatedOnDemandTab(_("Queue-based Resources Planning"), "limiting-resources", componentCreator) { @Override @@ -153,7 +153,7 @@ public class LimitingResourcesTabCreator { breadcrumbs.appendChild(new Label(getSchedulingLabel())); breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR)); breadcrumbs.appendChild(new Label( - _("Limiting Resources Planning"))); + _("Queue-based Resources Planning"))); } }; } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java index 94bfe3309..b6f177fca 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java @@ -434,8 +434,8 @@ public class TaskPropertiesController extends GenericForwardComposer { * */ public enum ResourceAllocationTypeEnum { - NON_LIMITING_RESOURCES(_("Non limiting resource assignment")), - LIMITING_RESOURCES(_("Limiting resource assignation")), + NON_LIMITING_RESOURCES(_("Normal resource assignment")), + LIMITING_RESOURCES(_("Queue-based resource assignation")), SUBCONTRACT(_("Subcontract")); /** diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java index 91e4192b1..1ebd4e899 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java @@ -846,9 +846,9 @@ public class WorkerCRUDController extends GenericForwardComposer implements } public enum LimitingResourceEnum { - ALL(_("ALL")), - LIMITING_RESOURCE(_("LIMITING RESOURCE")), - NON_LIMITING_RESOURCE(_("NON LIMITING RESOURCE")); + ALL(_("All")), + LIMITING_RESOURCE(_("Queue-based resource")), + NON_LIMITING_RESOURCE(_("Normal resource")); /** * Forces to mark the string as needing translation diff --git a/libreplan-webapp/src/main/webapp/planner/editTask.zul b/libreplan-webapp/src/main/webapp/planner/editTask.zul index 9da0faaff..a80e58bc4 100644 --- a/libreplan-webapp/src/main/webapp/planner/editTask.zul +++ b/libreplan-webapp/src/main/webapp/planner/editTask.zul @@ -64,8 +64,8 @@ - - + + diff --git a/libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul b/libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul index 82d894644..9f144216e 100644 --- a/libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul +++ b/libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul @@ -83,7 +83,7 @@ itemRenderer="@{controller.renderer}"> - + diff --git a/libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul b/libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul index fae79ee7d..16228d6ee 100644 --- a/libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul +++ b/libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul @@ -65,7 +65,7 @@ - - + diff --git a/libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul b/libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul index e67b45320..d0c4d4931 100644 --- a/libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul +++ b/libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul @@ -43,7 +43,7 @@ - -