From d4ff06e857c6ffd8cd6e30660ffd90c1c5196deb Mon Sep 17 00:00:00 2001 From: Diego Pino Garcia Date: Mon, 26 Jul 2010 11:04:19 +0200 Subject: [PATCH] ItEr59S08CUAsignacionRecursosLimitantesItEr58S10: Fix bug panel on the left was only internationalized first time is render * Should avoid avoid using static literals for menu-option labels --- .../planner/tabs/LimitingResourcesTabCreator.java | 8 +++----- .../web/planner/tabs/OrdersTabCreator.java | 14 +++++--------- .../web/planner/tabs/PlanningTabCreator.java | 11 ++++------- .../web/planner/tabs/ResourcesLoadTabCreator.java | 12 ++++-------- 4 files changed, 16 insertions(+), 29 deletions(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java index ff342cd0f..a129fe57c 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java @@ -41,10 +41,8 @@ import org.zkoss.zul.Label; */ public class LimitingResourcesTabCreator { - private static final String LIMITING_RESOURCES_VIEW = _("Limiting resources"); - /* Unnecesary */ - private static final String ORDER_LIMITING_RESOURCES_VIEW = _("Limiting resources (order)"); + private static String ORDER_LIMITING_RESOURCES_VIEW = _("Limiting resources (order)"); public static ITab create(Mode mode, LimitingResourcesController LimitingResourcesController, @@ -136,7 +134,7 @@ public class LimitingResourcesTabCreator { } }; - return new CreatedOnDemandTab(LIMITING_RESOURCES_VIEW, + return new CreatedOnDemandTab(_("Limiting resources"), "limiting-resources", componentCreator) { @Override @@ -149,7 +147,7 @@ public class LimitingResourcesTabCreator { breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR)); breadcrumbs.appendChild(new Label(PLANNIFICATION)); breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR)); - breadcrumbs.appendChild(new Label(LIMITING_RESOURCES_VIEW)); + breadcrumbs.appendChild(new Label(_("Limiting resources"))); } }; } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java index 18f359975..f6c0491cf 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java @@ -41,10 +41,6 @@ import org.zkoss.zul.Label; */ public class OrdersTabCreator { - private static final String ORDERS_VIEW = _("Orders List"); - - private static final String ORDER_ORDERS_VIEW = _("Order Details"); - private final Map parameters; public static ITab create(Mode mode, @@ -102,7 +98,7 @@ public class OrdersTabCreator { } private ITab createGlobalOrdersTab() { - return new CreatedOnDemandTab(ORDERS_VIEW, "orders", ordersTabCreator) { + return new CreatedOnDemandTab(_("Orders List"), "orders", ordersTabCreator) { @Override protected void afterShowAction() { orderCRUDController.goToList(); @@ -110,9 +106,9 @@ public class OrdersTabCreator { breadcrumbs.getChildren().clear(); } breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR)); - breadcrumbs.appendChild(new Label(PlanningTabCreator.ENTERPRISE_VIEW)); + breadcrumbs.appendChild(new Label(_("Company Scheduling"))); breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR)); - breadcrumbs.appendChild(new Label(ORDER_ORDERS_VIEW)); + breadcrumbs.appendChild(new Label(_("Order List"))); } }; } @@ -129,13 +125,13 @@ public class OrdersTabCreator { } private ITab createOrderOrdersTab() { - return new CreatedOnDemandTab(ORDER_ORDERS_VIEW, "order-data", + return new CreatedOnDemandTab(_("Order Details"), "order-data", ordersTabCreator) { @Override protected void afterShowAction() { breadcrumbs.getChildren().clear(); breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR)); - breadcrumbs.appendChild(new Label(ORDER_ORDERS_VIEW)); + breadcrumbs.appendChild(new Label(_("Order Details"))); breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR)); if (mode.isOf(ModeType.ORDER)) { orderCRUDController.showOrderElementFilter(); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java index eee2801c8..3bd6266ec 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java @@ -51,9 +51,6 @@ import org.zkoss.zul.Label; */ public class PlanningTabCreator { - public static final String ENTERPRISE_VIEW = _("Company Scheduling"); - - public static final String ORDER_ENTERPRISE_VIEW = _("Order Scheduling"); public static final int MAX_ORDERNAME_LENGHT = 90; private final Mode mode; @@ -153,7 +150,7 @@ public class PlanningTabCreator { } }; - return new CreatedOnDemandTab(ENTERPRISE_VIEW, "company-scheduling", + return new CreatedOnDemandTab(_("Company Scheduling"), "company-scheduling", componentCreator) { @Override protected void afterShowAction() { @@ -162,7 +159,7 @@ public class PlanningTabCreator { breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR)); breadcrumbs.appendChild(new Label(PLANNIFICATION)); breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR)); - breadcrumbs.appendChild(new Label(ENTERPRISE_VIEW)); + breadcrumbs.appendChild(new Label(_("Company Scheduling"))); } }; } @@ -185,7 +182,7 @@ public class PlanningTabCreator { } }; - return new CreatedOnDemandTab(ORDER_ENTERPRISE_VIEW, + return new CreatedOnDemandTab(_("Order Scheduling"), "order-scheduling", componentCreator) { @Override protected void afterShowAction() { @@ -203,7 +200,7 @@ public class PlanningTabCreator { breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR)); breadcrumbs.appendChild(new Label(PLANNIFICATION)); breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR)); - breadcrumbs.appendChild(new Label(ORDER_ENTERPRISE_VIEW)); + breadcrumbs.appendChild(new Label(_("Order Scheduling"))); if (mode.isOf(ModeType.ORDER)) { Label nameLabel = new Label(order.getName()); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java index 92eba5c2a..8f547133f 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java @@ -43,10 +43,6 @@ import org.zkoss.zul.Label; */ public class ResourcesLoadTabCreator { - private static final String RESOURCE_LOAD_VIEW = _("Overall Resources Load"); - - private static final String ORDER_RESOURCE_LOAD_VIEW = _("Resources Load"); - private final IOrderPlanningGate orderPlanningGate; public static ITab create(Mode mode, @@ -105,7 +101,7 @@ public class ResourcesLoadTabCreator { } }; - return new CreatedOnDemandTab(ORDER_RESOURCE_LOAD_VIEW, "order-load", + return new CreatedOnDemandTab(_("Resources Load"), "order-load", componentCreator) { @Override @@ -114,7 +110,7 @@ public class ResourcesLoadTabCreator { breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR)); breadcrumbs.appendChild(new Label(PLANNIFICATION)); breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR)); - breadcrumbs.appendChild(new Label(ORDER_RESOURCE_LOAD_VIEW)); + breadcrumbs.appendChild(new Label(_("Resources Load"))); breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR)); Order currentOrder = mode.getOrder(); resourceLoadController @@ -141,7 +137,7 @@ public class ResourcesLoadTabCreator { } }; - return new CreatedOnDemandTab(RESOURCE_LOAD_VIEW, "company-load", + return new CreatedOnDemandTab(_("Overall Resources Load"), "company-load", componentCreator) { @Override protected void afterShowAction() { @@ -155,7 +151,7 @@ public class ResourcesLoadTabCreator { breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR)); breadcrumbs.appendChild(new Label(PLANNIFICATION)); breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR)); - breadcrumbs.appendChild(new Label(RESOURCE_LOAD_VIEW)); + breadcrumbs.appendChild(new Label(_("Overall Resources Load"))); } }; }