RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ItEr59S08CUAsignacionRecursosLimitantesItEr58S10: Fix bug panel on the left was only internationalized first time is render

Browse source 
* Should avoid avoid using static literals for menu-option labels
This commit is contained in:
Diego Pino Garcia 2010-07-26 11:04:19 +02:00 • committed by Javier Moran Rua
parent 318ea2c17c
commit d4ff06e857
4 changed files with 16 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java
View file

@ -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")));
}
};
}

14
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java
View file

@ -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<String, String[]> 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();

11
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java
View file

@ -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());

12
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java
View file

@ -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")));
}
};
}