diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/common/entities/EntityNameEnum.java b/navalplanner-business/src/main/java/org/navalplanner/business/common/entities/EntityNameEnum.java index f3f5f9bb0..58bd46dbc 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/common/entities/EntityNameEnum.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/common/entities/EntityNameEnum.java @@ -38,9 +38,9 @@ import org.navalplanner.business.resources.entities.Worker; * @author Susana Montes Pedreira */ public enum EntityNameEnum { - ORDER(_("Order")), CRITERION(_("Criterion")), LABEL(_("Label")), MACHINE( - _("Machine")), WORKER(_("Worker")), UNIT_TYPE(_("Unit type")), CALENDAR( - _("Calendar")); + + ORDER("Order"), CRITERION("Criterion"), LABEL("Label"), MACHINE("Machine"), WORKER( + "Worker"), UNIT_TYPE("Unit type"), CALENDAR("Calendar"); private String description; @@ -77,4 +77,8 @@ public enum EntityNameEnum { } } + public String getSequenceLiteral() { + return getDescription() + " sequences"; + } + } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java index e55183fbd..9c3a768d0 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java @@ -56,6 +56,7 @@ import org.zkoss.zul.api.Window; /** * Controller for {@link Configuration} entity. * @author Manuel Rego Casasnovas + * @author Susana Montes Pedreira */ public class ConfigurationController extends GenericForwardComposer { @@ -90,6 +91,7 @@ public class ConfigurationController extends GenericForwardComposer { messages = new MessagesForUser(messagesContainer); createPanelEntityComponents(); + } private void createPanelEntityComponents() { @@ -104,17 +106,17 @@ public class ConfigurationController extends GenericForwardComposer { } } - private void initPanelTitle(Panel panel, final EntityNameEnum entityName) { - panel.setTitle(_("{0} sequences", entityName.getDescription())); + private void initPanelTitle(Panel panel, EntityNameEnum entityName) { + panel.setTitle(_(entityName.getSequenceLiteral())); } private void initButtonInPanelSequence(Component component, final EntityNameEnum entityName) { - String name = entityName.getDescription(); + String name = entityName.getDescription().toLowerCase(); try { Button button = (Button) component.getFirstChild().getFirstChild() .getFirstChild(); - button.setLabel(_("New {0} sequence", name)); + button.setLabel(_("New " + name + " sequence")); button.addEventListener(Events.ON_CLICK, new EventListener() { @Override diff --git a/navalplanner-webapp/src/main/resources/i18n/es.po b/navalplanner-webapp/src/main/resources/i18n/es.po index 87611039e..b98945cbd 100644 --- a/navalplanner-webapp/src/main/resources/i18n/es.po +++ b/navalplanner-webapp/src/main/resources/i18n/es.po @@ -141,6 +141,24 @@ msgstr "Operaciones" msgid "New order sequence" msgstr "Nueva secuencia de pedido" +msgid "New criterion sequence" +msgstr "Nueva secuencia de criterio" + +msgid "New label sequence" +msgstr "Nueva secuencia de etiqueta" + +msgid "New machine sequence" +msgstr "Nueva secuencia de maquina" + +msgid "New worker sequence" +msgstr "Nueva secuencia de trabajador" + +msgid "New unit type sequence" +msgstr "Nueva secuencia de unidad de medida" + +msgid "New calendar sequence" +msgstr "Nueva secuencia de calendario" + #: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:27 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:29 msgid "Add criterion" @@ -224,6 +242,24 @@ msgstr "Formularios de calidad" msgid "Order sequences" msgstr "Secuencias de pedido" +msgid "Criterion sequences" +msgstr "Secuencias de criterio" + +msgid "Label sequences" +msgstr "Secuencias de etiqueta" + +msgid "Machine sequences" +msgstr "Secuencias de maquina" + +msgid "Worker sequences" +msgstr "Secuencias de trabajador" + +msgid "Unit type sequences" +msgstr "Secuencias de unidad de medida" + +msgid "Calendar sequences" +msgstr "Secuencias de calendario" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:273 msgid "Reports" msgstr "Informes" diff --git a/navalplanner-webapp/src/main/resources/i18n/gl.po b/navalplanner-webapp/src/main/resources/i18n/gl.po index 6b8145d7d..76fa0a1d7 100644 --- a/navalplanner-webapp/src/main/resources/i18n/gl.po +++ b/navalplanner-webapp/src/main/resources/i18n/gl.po @@ -141,6 +141,24 @@ msgstr "Operacións" msgid "New order sequence" msgstr "Nova secuencia de pedido" +msgid "New criterion sequence" +msgstr "Nova secuencia de criterio" + +msgid "New label sequence" +msgstr "Nova secuencia de etiqueta" + +msgid "New machine sequence" +msgstr "Nova secuencia de maquina" + +msgid "New worker sequence" +msgstr "Nova secuencia de traballador" + +msgid "New unit type sequence" +msgstr "Nova secuencia de unidade de medida" + +msgid "New calendar sequence" +msgstr "Nova secuencia de calendario" + #: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:27 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:29 msgid "Add criterion" @@ -224,6 +242,24 @@ msgstr "Formularios de calidade" msgid "Order sequences" msgstr "Secuencias de pedido" +msgid "Criterion sequences" +msgstr "Secuencias de criterio" + +msgid "Label sequences" +msgstr "Secuencias de etiqueta" + +msgid "Machine sequences" +msgstr "Secuencias de maquina" + +msgid "Worker sequences" +msgstr "Secuencias de traballador" + +msgid "Unit type sequences" +msgstr "Secuencias de unidade de medida" + +msgid "Calendar sequences" +msgstr "Secuencias de calendario" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:273 msgid "Reports" msgstr "Informes" diff --git a/navalplanner-webapp/src/main/resources/i18n/keys.pot b/navalplanner-webapp/src/main/resources/i18n/keys.pot index d90f53704..bb9985624 100644 --- a/navalplanner-webapp/src/main/resources/i18n/keys.pot +++ b/navalplanner-webapp/src/main/resources/i18n/keys.pot @@ -140,6 +140,24 @@ msgstr "" msgid "New order sequence" msgstr "" +msgid "New criterion sequence" +msgstr "" + +msgid "New label sequence" +msgstr "" + +msgid "New machine sequence" +msgstr "" + +msgid "New worker sequence" +msgstr "" + +msgid "New unit type sequence" +msgstr "" + +msgid "New calendar sequence" +msgstr "" + #: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:27 #: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:29 msgid "Add criterion" @@ -223,6 +241,24 @@ msgstr "" msgid "Order sequences" msgstr "" +msgid "Criterion sequences" +msgstr "" + +msgid "Label sequences" +msgstr "" + +msgid "Machine sequences" +msgstr "" + +msgid "Worker sequences" +msgstr "" + +msgid "Unit type sequences" +msgstr "" + +msgid "Calendar sequences" +msgstr "" + #: navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java:273 msgid "Reports" msgstr ""