From cc8a0f6e96457314cb4784bd717c735ec942c5f1 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Wed, 7 Oct 2015 16:56:08 +0000 Subject: [PATCH] 915: TDM - Support the Spanish language Task-Url: https://support.d4science.org/issues/915 Updated Spanish support git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-column-widget@119501 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../user/td/columnwidget/ColumnWidget.gwt.xml | 12 +- .../client/ChangeColumnTypeDialog.java | 5 +- .../client/ChangeColumnTypeMessages.java | 86 ++++++++++++++ .../client/ChangeColumnTypePanel.java | 107 +++++------------- .../client/DeleteColumnDialog.java | 6 +- .../client/DeleteColumnMessages.java | 27 +++++ .../client/DeleteColumnPanel.java | 18 +-- .../client/LabelColumnDialog.java | 5 +- .../client/LabelColumnMessages.java | 46 ++++++++ .../columnwidget/client/LabelColumnPanel.java | 29 ++--- .../user/td/columnwidget/ColumnWidget.gwt.xml | 86 +++++++------- .../ChangeColumnTypeMessages.properties | 23 ++++ .../ChangeColumnTypeMessages_es.properties | 23 ++++ .../ChangeColumnTypeMessages_it.properties | 23 ++++ .../client/DeleteColumnMessages.properties | 4 + .../client/DeleteColumnMessages_es.properties | 4 + .../client/DeleteColumnMessages_it.properties | 4 + .../client/LabelColumnMessages.properties | 9 ++ .../client/LabelColumnMessages_es.properties | 9 ++ .../client/LabelColumnMessages_it.properties | 9 ++ .../columnwidget/client/Messages.properties | 2 - .../client/Messages_fr.properties | 2 - 22 files changed, 391 insertions(+), 148 deletions(-) create mode 100644 src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypeMessages.java create mode 100644 src/main/java/org/gcube/portlets/user/td/columnwidget/client/DeleteColumnMessages.java create mode 100644 src/main/java/org/gcube/portlets/user/td/columnwidget/client/LabelColumnMessages.java create mode 100644 src/main/resources/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypeMessages.properties create mode 100644 src/main/resources/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypeMessages_es.properties create mode 100644 src/main/resources/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypeMessages_it.properties create mode 100644 src/main/resources/org/gcube/portlets/user/td/columnwidget/client/DeleteColumnMessages.properties create mode 100644 src/main/resources/org/gcube/portlets/user/td/columnwidget/client/DeleteColumnMessages_es.properties create mode 100644 src/main/resources/org/gcube/portlets/user/td/columnwidget/client/DeleteColumnMessages_it.properties create mode 100644 src/main/resources/org/gcube/portlets/user/td/columnwidget/client/LabelColumnMessages.properties create mode 100644 src/main/resources/org/gcube/portlets/user/td/columnwidget/client/LabelColumnMessages_es.properties create mode 100644 src/main/resources/org/gcube/portlets/user/td/columnwidget/client/LabelColumnMessages_it.properties delete mode 100644 src/main/resources/org/gcube/portlets/user/td/columnwidget/client/Messages.properties delete mode 100644 src/main/resources/org/gcube/portlets/user/td/columnwidget/client/Messages_fr.properties diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/ColumnWidget.gwt.xml b/src/main/java/org/gcube/portlets/user/td/columnwidget/ColumnWidget.gwt.xml index 7ed1339..9793870 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/ColumnWidget.gwt.xml +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/ColumnWidget.gwt.xml @@ -2,6 +2,7 @@ + @@ -25,9 +26,18 @@ - + + diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypeDialog.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypeDialog.java index 4506b2b..d3d1076 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypeDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypeDialog.java @@ -2,6 +2,7 @@ package org.gcube.portlets.user.td.columnwidget.client; import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; +import com.google.gwt.core.client.GWT; import com.google.web.bindery.event.shared.EventBus; import com.sencha.gxt.widget.core.client.Window; import com.sencha.gxt.widget.core.client.event.SelectEvent; @@ -17,6 +18,7 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler; public class ChangeColumnTypeDialog extends Window { private static final String WIDTH = "650px"; private static final String HEIGHT = "530px"; + private ChangeColumnTypeMessages msgs; public ChangeColumnTypeDialog(TRId trId, EventBus eventBus) { @@ -29,6 +31,7 @@ public class ChangeColumnTypeDialog extends Window { } protected void create(TRId trId, String columnName, EventBus eventBus) { + msgs = GWT.create(ChangeColumnTypeMessages.class); initWindow(); ChangeColumnTypePanel changeColumnTypePanel = new ChangeColumnTypePanel( trId, columnName, eventBus); @@ -41,7 +44,7 @@ public class ChangeColumnTypeDialog extends Window { setHeight(HEIGHT); setBodyBorder(false); setResizable(false); - setHeadingText("Change Column Type"); + setHeadingText(msgs.dialogHeadingText()); // getHeader().setIcon(Resources.IMAGES.side_list()); } diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypeMessages.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypeMessages.java new file mode 100644 index 0000000..dddd599 --- /dev/null +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypeMessages.java @@ -0,0 +1,86 @@ +package org.gcube.portlets.user.td.columnwidget.client; + +import com.google.gwt.i18n.client.Messages; + +/** + * + * @author giancarlo email: g.panichi@isti.cnr.it + * + */ +public interface ChangeColumnTypeMessages extends Messages { + + @DefaultMessage("Change Column Type") + String dialogHeadingText(); + + @DefaultMessage("Select a column...") + String comboColumnEmptyText(); + + @DefaultMessage("Column") + String comboColumnLabel(); + + @DefaultMessage("Select a column type...") + String comboColumnTypeCodeEmptyText(); + + @DefaultMessage("Column Type") + String comboColumnTypeCodeLabel(); + + @DefaultMessage("Select a measure type...") + String comboMeasureTypeEmptyText(); + + @DefaultMessage("Measure Type") + String comboMeasureTypeLabel(); + + @DefaultMessage("Select a column type...") + String comboAttributeTypeEmptyText(); + + @DefaultMessage("Attribute Type") + String comboAttributeTypeLabel(); + + @DefaultMessage("Select a locale type...") + String comboLocaleTypeEmptyText(); + + @DefaultMessage("Locale") + String comboLocaleTypeLabel(); + + @DefaultMessage("Select a Codelist...") + String comboDimensionTypeEmptyText(); + + @DefaultMessage("Codelist") + String comboDimensionTypeLabel(); + + @DefaultMessage("Select a Column Reference...") + String comboColumnReferenceTypeEmptyText(); + + @DefaultMessage("Column") + String comboColumnReferenceTypeLabel(); + + @DefaultMessage("Select optional mapping...") + String comboColumnMappingEmptyText(); + + @DefaultMessage("Mapping") + String comboColumnMappingLabel(); + + @DefaultMessage("Select a period type...") + String comboPeriodTypeEmptyText(); + + @DefaultMessage("Period Type") + String comboPeriodTypeLabel(); + + @DefaultMessage("Select a format...") + String comboValueDataFormatEmptyText(); + + @DefaultMessage("Format") + String comboValueDataFormatLabel(); + + //Apply Button + @DefaultMessage("Apply") + String applyBtnText(); + + @DefaultMessage("Apply Column Type") + String applyBtnToolTip(); + + + + +} diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypePanel.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypePanel.java index 8c099a8..9ae5af2 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypePanel.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypePanel.java @@ -78,7 +78,6 @@ import com.sencha.gxt.widget.core.client.event.TriggerClickEvent; import com.sencha.gxt.widget.core.client.event.TriggerClickEvent.TriggerClickHandler; import com.sencha.gxt.widget.core.client.form.ComboBox; import com.sencha.gxt.widget.core.client.form.FieldLabel; -import com.sencha.gxt.widget.core.client.info.Info; /** * @@ -150,8 +149,10 @@ public class ChangeColumnTypePanel extends FramedPanel implements private ChangeColumnTypeSession changeColumnTypeSession; private boolean panelCreated; + private ChangeColumnTypeMessages msgs; public ChangeColumnTypePanel(TRId trId, String columnName, EventBus eventBus) { + msgs = GWT.create(ChangeColumnTypeMessages.class); setWidth(WIDTH); setHeight(HEIGHT); setHeaderVisible(false); @@ -304,12 +305,14 @@ public class ChangeColumnTypePanel extends FramedPanel implements addHandlersForComboColumn(propsColumnData.label()); comboColumn.setLoader(loader); - comboColumn.setEmptyText("Select a column..."); + comboColumn.setEmptyText(msgs.comboColumnEmptyText()); comboColumn.setWidth(191); comboColumn.setTypeAhead(false); comboColumn.setEditable(false); comboColumn.setTriggerAction(TriggerAction.ALL); - + + FieldLabel comboColumnLabel=new FieldLabel(comboColumn, msgs.comboColumnLabel()); + // comboColumnTypeCode ColumnTypeCodeProperties propsColumnTypeCode = GWT .create(ColumnTypeCodeProperties.class); @@ -323,13 +326,14 @@ public class ChangeColumnTypePanel extends FramedPanel implements addHandlersForComboColumnTypeCode(propsColumnTypeCode.label()); - comboColumnTypeCode.setEmptyText("Select a column type..."); + comboColumnTypeCode.setEmptyText(msgs.comboColumnTypeCodeEmptyText()); comboColumnTypeCode.setWidth(191); comboColumnTypeCode.setTypeAhead(true); comboColumnTypeCode.setTriggerAction(TriggerAction.ALL); comboColumnTypeCodeLabel = new FieldLabel(comboColumnTypeCode, - "Column Type"); + msgs.comboColumnTypeCodeLabel()); + // comboMeasureType ColumnDataTypeProperties propsMeasureType = GWT .create(ColumnDataTypeProperties.class); @@ -343,12 +347,12 @@ public class ChangeColumnTypePanel extends FramedPanel implements addHandlersForComboMeasureType(propsMeasureType.label()); - comboMeasureType.setEmptyText("Select a measure type..."); + comboMeasureType.setEmptyText(msgs.comboMeasureTypeEmptyText()); comboMeasureType.setWidth(191); comboMeasureType.setTypeAhead(true); comboMeasureType.setTriggerAction(TriggerAction.ALL); - comboMeasureTypeLabel = new FieldLabel(comboMeasureType, "Measure Type"); + comboMeasureTypeLabel = new FieldLabel(comboMeasureType, msgs.comboMeasureTypeLabel()); // comboAttributeType ColumnDataTypeProperties propsAttributeType = GWT @@ -363,13 +367,13 @@ public class ChangeColumnTypePanel extends FramedPanel implements addHandlersForComboAttributeType(propsAttributeType.label()); - comboAttributeType.setEmptyText("Select a column type..."); + comboAttributeType.setEmptyText(msgs.comboAttributeTypeEmptyText()); comboAttributeType.setWidth(191); comboAttributeType.setTypeAhead(true); comboAttributeType.setTriggerAction(TriggerAction.ALL); comboAttributeTypeLabel = new FieldLabel(comboAttributeType, - "Attribute Type"); + msgs.comboAttributeTypeLabel()); // comboLocaleType LocaleTypeProperties propsLocaleType = GWT @@ -393,12 +397,12 @@ public class ChangeColumnTypePanel extends FramedPanel implements addHandlersForComboLocaleType(propsLocaleType.label()); - comboLocaleType.setEmptyText("Select a locale type..."); + comboLocaleType.setEmptyText(msgs.comboLocaleTypeEmptyText()); comboLocaleType.setWidth(191); comboLocaleType.setTypeAhead(true); comboLocaleType.setTriggerAction(TriggerAction.ALL); - comboLocaleTypeLabel = new FieldLabel(comboLocaleType, "Locale"); + comboLocaleTypeLabel = new FieldLabel(comboLocaleType, msgs.comboLocaleTypeLabel()); // comboDimensionType TabResourcePropertiesCombo propsDimensionType = GWT @@ -412,12 +416,12 @@ public class ChangeColumnTypePanel extends FramedPanel implements addHandlersForComboDimensionType(propsDimensionType.label()); - comboDimensionType.setEmptyText("Select a Dimension..."); + comboDimensionType.setEmptyText(msgs.comboDimensionTypeEmptyText()); comboDimensionType.setWidth(191); comboDimensionType.setEditable(false); comboDimensionType.setTriggerAction(TriggerAction.ALL); - comboDimensionTypeLabel = new FieldLabel(comboDimensionType, "Codelist"); + comboDimensionTypeLabel = new FieldLabel(comboDimensionType, msgs.comboDimensionTypeLabel()); // ColumnReferenceType ColumnDataPropertiesCombo propsColumnReferenceType = GWT @@ -431,13 +435,13 @@ public class ChangeColumnTypePanel extends FramedPanel implements addHandlersForComboColumnReferenceType(propsColumnReferenceType.label()); - comboColumnReferenceType.setEmptyText("Select a Column Reference..."); + comboColumnReferenceType.setEmptyText(msgs.comboColumnReferenceTypeEmptyText()); comboColumnReferenceType.setWidth(191); comboColumnReferenceType.setEditable(false); comboColumnReferenceType.setTriggerAction(TriggerAction.ALL); comboColumnReferenceTypeLabel = new FieldLabel( - comboColumnReferenceType, "Column"); + comboColumnReferenceType, msgs.comboColumnReferenceTypeLabel()); // ColumnMapping ColumnMappingListProperties propsColumnMapping = GWT @@ -451,12 +455,12 @@ public class ChangeColumnTypePanel extends FramedPanel implements addHandlersForComboColumnMapping(propsColumnMapping.name()); - comboColumnMapping.setEmptyText("Select optional mapping..."); + comboColumnMapping.setEmptyText(msgs.comboColumnMappingEmptyText()); comboColumnMapping.setWidth(191); comboColumnMapping.setEditable(false); comboColumnMapping.setTriggerAction(TriggerAction.ALL); - comboColumnMappingLabel = new FieldLabel(comboColumnMapping, "Mapping"); + comboColumnMappingLabel = new FieldLabel(comboColumnMapping, msgs.comboColumnMappingLabel()); // comboPeriodType PeriodDataTypeProperties propsPeriodDataType = GWT @@ -480,11 +484,11 @@ public class ChangeColumnTypePanel extends FramedPanel implements addHandlersForComboPeriodType(propsPeriodDataType.label()); - comboPeriodType.setEmptyText("Select a period type..."); + comboPeriodType.setEmptyText(msgs.comboPeriodTypeEmptyText()); comboPeriodType.setWidth(191); comboPeriodType.setTypeAhead(true); comboPeriodType.setTriggerAction(TriggerAction.ALL); - comboPeriodTypeLabel = new FieldLabel(comboPeriodType, "Period Type"); + comboPeriodTypeLabel = new FieldLabel(comboPeriodType, msgs.comboPeriodTypeLabel()); // comboValueDataFormat ValueDataFormatProperties propsValueDataFormat = GWT @@ -509,18 +513,18 @@ public class ChangeColumnTypePanel extends FramedPanel implements addHandlersForComboValueDataFormat(propsValueDataFormat.label()); - comboValueDataFormat.setEmptyText("Select a format..."); + comboValueDataFormat.setEmptyText(msgs.comboValueDataFormatEmptyText()); comboValueDataFormat.setWidth(191); comboValueDataFormat.setTypeAhead(true); comboValueDataFormat.setTriggerAction(TriggerAction.ALL); comboValueDataFormatLabel = new FieldLabel(comboValueDataFormat, - "Format"); + msgs.comboValueDataFormatLabel()); // Apply - applyBtn = new TextButton("Apply"); + applyBtn = new TextButton(msgs.applyBtnText()); applyBtn.setIcon(ResourceBundle.INSTANCE.columnType()); applyBtn.setIconAlign(IconAlign.RIGHT); - applyBtn.setToolTip("Apply Column Type"); + applyBtn.setToolTip(msgs.applyBtnToolTip()); SelectHandler changeHandler = new SelectHandler() { @@ -532,7 +536,7 @@ public class ChangeColumnTypePanel extends FramedPanel implements applyBtn.addSelectHandler(changeHandler); VerticalLayoutContainer v = new VerticalLayoutContainer(); - v.add(new FieldLabel(comboColumn, "Column"), new VerticalLayoutData(1, + v.add(comboColumnLabel, new VerticalLayoutData(1, -1, new Margins(1))); v.add(comboColumnTypeCodeLabel, new VerticalLayoutData(1, -1, new Margins(1))); @@ -577,12 +581,6 @@ public class ChangeColumnTypePanel extends FramedPanel implements final LabelProvider labelProvider) { comboColumn.addSelectionHandler(new SelectionHandler() { public void onSelection(SelectionEvent event) { - Info.display( - "Column Type Selected", - "You selected " - + (event.getSelectedItem() == null ? "nothing" - : labelProvider.getLabel(event - .getSelectedItem()) + "!")); Log.debug("ComboColumn selected: " + event.getSelectedItem()); ColumnData columnData = event.getSelectedItem(); updateComboStatus(columnData); @@ -597,13 +595,6 @@ public class ChangeColumnTypePanel extends FramedPanel implements .addSelectionHandler(new SelectionHandler() { public void onSelection( SelectionEvent event) { - Info.display( - "Column Type Selected", - "You selected " - + (event.getSelectedItem() == null ? "nothing" - : labelProvider.getLabel(event - .getSelectedItem()) - + "!")); Log.debug("ComboColumnTypeCode selected: " + event.getSelectedItem()); ColumnTypeCodeElement columnType = event @@ -621,13 +612,6 @@ public class ChangeColumnTypePanel extends FramedPanel implements .addSelectionHandler(new SelectionHandler() { public void onSelection( SelectionEvent event) { - Info.display( - "Measure Type Selected", - "You selected " - + (event.getSelectedItem() == null ? "nothing" - : labelProvider.getLabel(event - .getSelectedItem()) - + "!")); Log.debug("ComboMeasureType selected: " + event.getSelectedItem()); ColumnDataTypeElement measureType = event @@ -644,13 +628,6 @@ public class ChangeColumnTypePanel extends FramedPanel implements .addSelectionHandler(new SelectionHandler() { public void onSelection( SelectionEvent event) { - Info.display( - "Attribute Type Selected", - "You selected " - + (event.getSelectedItem() == null ? "nothing" - : labelProvider.getLabel(event - .getSelectedItem()) - + "!")); Log.debug("ComboAttributeType selected: " + event.getSelectedItem()); ColumnDataTypeElement attributeType = event @@ -667,13 +644,6 @@ public class ChangeColumnTypePanel extends FramedPanel implements .addSelectionHandler(new SelectionHandler() { public void onSelection( SelectionEvent event) { - Info.display( - "Locale Type Selected", - "You selected " - + (event.getSelectedItem() == null ? "nothing" - : labelProvider.getLabel(event - .getSelectedItem()) - + "!")); Log.debug("ComboLocaleType selected: " + event.getSelectedItem()); LocaleTypeElement localeType = event.getSelectedItem(); @@ -706,13 +676,6 @@ public class ChangeColumnTypePanel extends FramedPanel implements comboColumnReferenceType .addSelectionHandler(new SelectionHandler() { public void onSelection(SelectionEvent event) { - Info.display( - "Column Reference Selected", - "You selected " - + (event.getSelectedItem() == null ? "nothing" - : labelProvider.getLabel(event - .getSelectedItem()) - + "!")); Log.debug("ComboColumnReferenceType selected: " + event.getSelectedItem()); @@ -744,13 +707,6 @@ public class ChangeColumnTypePanel extends FramedPanel implements comboPeriodType .addSelectionHandler(new SelectionHandler() { public void onSelection(SelectionEvent event) { - Info.display( - "Period Type Selected", - "You selected " - + (event.getSelectedItem() == null ? "nothing" - : labelProvider.getLabel(event - .getSelectedItem()) - + "!")); Log.debug("ComboPeriodType selected: " + event.getSelectedItem()); PeriodDataType periodDataType = event.getSelectedItem(); @@ -766,13 +722,6 @@ public class ChangeColumnTypePanel extends FramedPanel implements .addSelectionHandler(new SelectionHandler() { public void onSelection( SelectionEvent event) { - Info.display( - "Time Format Selected", - "You selected " - + (event.getSelectedItem() == null ? "nothing" - : labelProvider.getLabel(event - .getSelectedItem()) - + "!")); Log.debug("ComboTimeDataFormat selected: " + event.getSelectedItem()); ValueDataFormat timeDataFormat = event diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/DeleteColumnDialog.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/DeleteColumnDialog.java index fbd31a3..9b89198 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/DeleteColumnDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/DeleteColumnDialog.java @@ -2,6 +2,7 @@ package org.gcube.portlets.user.td.columnwidget.client; import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; +import com.google.gwt.core.client.GWT; import com.google.web.bindery.event.shared.EventBus; import com.sencha.gxt.widget.core.client.Window; import com.sencha.gxt.widget.core.client.event.SelectEvent; @@ -17,6 +18,7 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler; public class DeleteColumnDialog extends Window { private static final int WIDTH=400; private static final int HEIGHT=120; + private DeleteColumnMessages msgs; public DeleteColumnDialog(TRId trId, EventBus eventBus) { create(trId, null, eventBus); @@ -27,7 +29,7 @@ public class DeleteColumnDialog extends Window { } protected void create(TRId trId, String columnName, EventBus eventBus) { - + msgs = GWT.create(DeleteColumnMessages.class); initWindow(); DeleteColumnPanel deleteColumnPanel= new DeleteColumnPanel(trId, columnName, eventBus); @@ -39,7 +41,7 @@ public class DeleteColumnDialog extends Window { setHeight(HEIGHT); setBodyBorder(false); setResizable(false); - setHeadingText("Delete Columns"); + setHeadingText(msgs.dialogHeadingText()); //getHeader().setIcon(Resources.IMAGES.side_list()); } diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/DeleteColumnMessages.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/DeleteColumnMessages.java new file mode 100644 index 0000000..ba36d9e --- /dev/null +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/DeleteColumnMessages.java @@ -0,0 +1,27 @@ +package org.gcube.portlets.user.td.columnwidget.client; + +import com.google.gwt.i18n.client.Messages; + +/** + * + * @author giancarlo email: g.panichi@isti.cnr.it + * + */ +public interface DeleteColumnMessages extends Messages { + + @DefaultMessage("Delete Columns") + String dialogHeadingText(); + + // Delete Button + @DefaultMessage("Delete") + String deleteBtnText(); + + @DefaultMessage("Delete Columns") + String deleteBtnToolTip(); + + // + @DefaultMessage("Columns") + String columnsLabel(); + +} diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/DeleteColumnPanel.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/DeleteColumnPanel.java index 0a9fa73..af747d1 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/DeleteColumnPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/DeleteColumnPanel.java @@ -76,7 +76,7 @@ public class DeleteColumnPanel extends FramedPanel implements private String columnName; - private TextButton delete; + private TextButton deleteBtn; private ListLoader> loader; private Grid grid; @@ -85,8 +85,10 @@ public class DeleteColumnPanel extends FramedPanel implements private DeleteColumnSession deleteColumnSession; private ListStore store; + private DeleteColumnMessages msgs; public DeleteColumnPanel(TRId trId, String columnName, EventBus eventBus) { + msgs = GWT.create(DeleteColumnMessages.class); this.trId = trId; this.columnName = columnName; this.eventBus = eventBus; @@ -179,10 +181,10 @@ public class DeleteColumnPanel extends FramedPanel implements grid.setColumnResize(false); // Delete Button - delete = new TextButton("Delete"); - delete.setIcon(ResourceBundle.INSTANCE.columnDelete()); - delete.setIconAlign(IconAlign.RIGHT); - delete.setToolTip("Delete Column"); + deleteBtn = new TextButton(msgs.deleteBtnText()); + deleteBtn.setIcon(ResourceBundle.INSTANCE.columnDelete()); + deleteBtn.setIconAlign(IconAlign.RIGHT); + deleteBtn.setToolTip(msgs.deleteBtnToolTip()); SelectHandler deleteHandler = new SelectHandler() { @@ -191,12 +193,12 @@ public class DeleteColumnPanel extends FramedPanel implements } }; - delete.addSelectHandler(deleteHandler); + deleteBtn.addSelectHandler(deleteHandler); - FieldLabel columnsLabel = new FieldLabel(null, "Columns"); + FieldLabel columnsLabel = new FieldLabel(null, msgs.columnsLabel()); columnsLabel.getElement().applyStyles("font-weight:bold"); HBoxLayoutContainer hBox = new HBoxLayoutContainer(); - hBox.add(delete, new BoxLayoutData(new Margins(2, 5, 2, 5))); + hBox.add(deleteBtn, new BoxLayoutData(new Margins(2, 5, 2, 5))); VerticalLayoutContainer v = new VerticalLayoutContainer(); v.setScrollMode(ScrollMode.AUTOY); diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/LabelColumnDialog.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/LabelColumnDialog.java index 202b223..5d24c38 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/LabelColumnDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/LabelColumnDialog.java @@ -2,6 +2,7 @@ package org.gcube.portlets.user.td.columnwidget.client; import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; +import com.google.gwt.core.client.GWT; import com.google.web.bindery.event.shared.EventBus; import com.sencha.gxt.widget.core.client.Window; import com.sencha.gxt.widget.core.client.event.SelectEvent; @@ -17,6 +18,7 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler; public class LabelColumnDialog extends Window { private static final int WIDTH=400; private static final int HEIGHT=120; + private LabelColumnMessages msgs; public LabelColumnDialog(TRId trId, EventBus eventBus) { @@ -28,6 +30,7 @@ public class LabelColumnDialog extends Window { } protected void create(TRId trId, String columnName, EventBus eventBus) { + msgs = GWT.create(LabelColumnMessages.class); initWindow(); LabelColumnPanel labelColumnPanel= new LabelColumnPanel(trId, columnName, eventBus); @@ -39,7 +42,7 @@ public class LabelColumnDialog extends Window { setHeight(HEIGHT); setBodyBorder(false); setResizable(false); - setHeadingText("Label Columns"); + setHeadingText(msgs.dialogHeadingText()); } diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/LabelColumnMessages.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/LabelColumnMessages.java new file mode 100644 index 0000000..bd1e237 --- /dev/null +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/LabelColumnMessages.java @@ -0,0 +1,46 @@ +package org.gcube.portlets.user.td.columnwidget.client; + +import com.google.gwt.i18n.client.Messages; + +/** + * + * @author giancarlo email: g.panichi@isti.cnr.it + * + */ +public interface LabelColumnMessages extends Messages { + + @DefaultMessage("Label Columns") + String dialogHeadingText(); + + // Change Button + @DefaultMessage("Change") + String changeBtnText(); + + @DefaultMessage("Change Columns Label") + String changeBtnToolTip(); + + // + @DefaultMessage("Updated labels") + String updatedLabels(); + + // + @DefaultMessage("nolabel") + String nolabelText(); + + @DefaultMessage("nolabel") + String nolabelTextLabel(); + + // + @DefaultMessage("Insert valid labels!") + String insertValidLabels(); + + //Errors + @DefaultMessage("Error Changing The Column Label") + String errorChangingTheColumnLabelHead(); + + @DefaultMessage("Error in invocation of Change The Column Label operation!") + String errorChangingTheColumnLabel(); + + +} diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/LabelColumnPanel.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/LabelColumnPanel.java index 94fa708..ae28de2 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/LabelColumnPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/LabelColumnPanel.java @@ -22,6 +22,7 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData; import com.allen_sauer.gwt.log.client.Log; +import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.web.bindery.event.shared.EventBus; import com.sencha.gxt.cell.core.client.ButtonCell.IconAlign; @@ -59,13 +60,15 @@ public class LabelColumnPanel extends FramedPanel implements private ArrayList columns; private VerticalLayoutContainer columnsLayoutContainer; - private TextButton change; + private TextButton changeBtn; private LabelColumnSession labelColumnSession; private boolean updateStatus; private VerticalLayoutContainer v; + private LabelColumnMessages msgs; public LabelColumnPanel(TRId trId, String columnName, EventBus eventBus) { + msgs = GWT.create(LabelColumnMessages.class); this.trId = trId; this.eventBus = eventBus; updateStatus = false; @@ -149,12 +152,12 @@ public class LabelColumnPanel extends FramedPanel implements columnsContainer.forceLayout(); - change = new TextButton("Change"); - change.setIcon(ResourceBundle.INSTANCE.columnLabel()); - change.setIconAlign(IconAlign.RIGHT); - change.setToolTip("Change Column Label"); + changeBtn = new TextButton(msgs.changeBtnText()); + changeBtn.setIcon(ResourceBundle.INSTANCE.columnLabel()); + changeBtn.setIconAlign(IconAlign.RIGHT); + changeBtn.setToolTip(msgs.changeBtnToolTip()); - change.addSelectHandler(new SelectHandler() { + changeBtn.addSelectHandler(new SelectHandler() { public void onSelect(SelectEvent event) { changeLabelColumns(); @@ -166,7 +169,7 @@ public class LabelColumnPanel extends FramedPanel implements v.setScrollMode(ScrollMode.AUTOY); v.setAdjustForScroll(true); v.add(columnsContainer, new VerticalLayoutData(1, -1, new Margins(0))); - v.add(change, new VerticalLayoutData(-1, -1, new Margins(10, 0, 10, 0))); + v.add(changeBtn, new VerticalLayoutData(-1, -1, new Margins(10, 0, 10, 0))); add(v, new VerticalLayoutData(1, -1, new Margins(0))); forceLayout(); @@ -205,8 +208,8 @@ public class LabelColumnPanel extends FramedPanel implements textLabel.setId(col.getColumnId()); } else { TextField text = new TextField(); - text.setValue("nolabel"); - textLabel = new FieldLabel(text, "nolabel"); + text.setValue(msgs.nolabelText()); + textLabel = new FieldLabel(text, msgs.nolabelTextLabel()); textLabel.setLabelWidth(LABELWIDTH); textLabel.setId(col.getColumnId()); } @@ -270,7 +273,7 @@ public class LabelColumnPanel extends FramedPanel implements labelColumnSession = new LabelColumnSession(trId, maps); callLabelColumn(); } else { - UtilsGXT3.alert("Attention", "Insert valid labels!"); + UtilsGXT3.alert("Attention", msgs.insertValidLabels()); } } @@ -297,8 +300,8 @@ public class LabelColumnPanel extends FramedPanel implements Log.debug("Change The Column Label Error: " + caught.getLocalizedMessage()); UtilsGXT3 - .alert("Error Changing The Column Label", - "Error in invocation of Change The Column Label operation!"); + .alert(msgs.errorChangingTheColumnLabelHead(), + msgs.errorChangingTheColumnLabel()); } } } @@ -306,7 +309,7 @@ public class LabelColumnPanel extends FramedPanel implements public void onSuccess(String taskId) { UtilsGXT3 - .info("Success", "Updated labels"); + .info("Success", msgs.updatedLabels()); syncOpComplete(); //openMonitorDialog(taskId); diff --git a/src/main/resources/org/gcube/portlets/user/td/columnwidget/ColumnWidget.gwt.xml b/src/main/resources/org/gcube/portlets/user/td/columnwidget/ColumnWidget.gwt.xml index d6b2fba..2eaa2cd 100644 --- a/src/main/resources/org/gcube/portlets/user/td/columnwidget/ColumnWidget.gwt.xml +++ b/src/main/resources/org/gcube/portlets/user/td/columnwidget/ColumnWidget.gwt.xml @@ -1,52 +1,60 @@ - - - - - - - + + + - - - - - - + + + - - - - - - - + + + + + + + + + + + + + - - - - - - + + + + + + + + + + - - - - - + + + + + + - - - - diff --git a/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypeMessages.properties b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypeMessages.properties new file mode 100644 index 0000000..04c6658 --- /dev/null +++ b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypeMessages.properties @@ -0,0 +1,23 @@ +dialogHeadingText = Change Column Type +comboColumnEmptyText = Select a column... +comboColumnLabel = Column +comboColumnTypeCodeEmptyText = Select a column type... +comboColumnTypeCodeLabel = Column Type +comboMeasureTypeEmptyText = Select a measure type... +comboMeasureTypeLabel = Measure Type +comboAttributeTypeEmptyText = Select a column type... +comboAttributeTypeLabel = Attribute Type +comboLocaleTypeEmptyText = Select a locale type... +comboLocaleTypeLabel = Locale +comboDimensionTypeEmptyText = Select a Codelist... +comboDimensionTypeLabel = Codelist +comboColumnReferenceTypeEmptyText = Select a Column Reference... +comboColumnReferenceTypeLabel = Column +comboColumnMappingEmptyText = Select optional mapping... +comboColumnMappingLabel = Mapping +comboPeriodTypeEmptyText = Select a period type... +comboPeriodTypeLabel = Period Type +comboValueDataFormatEmptyText = Select a format... +comboValueDataFormatLabel = Format +applyBtnText = Apply +applyBtnToolTip = Apply Column Type diff --git a/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypeMessages_es.properties b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypeMessages_es.properties new file mode 100644 index 0000000..5bacf2f --- /dev/null +++ b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypeMessages_es.properties @@ -0,0 +1,23 @@ +dialogHeadingText = Cambio del Tipo de Columna +comboColumnEmptyText = Seleccionar una columna... +comboColumnLabel = Columna +comboColumnTypeCodeEmptyText = Seleccionar tipo... +comboColumnTypeCodeLabel = Tipo +comboMeasureTypeEmptyText = Seleccionar medida... +comboMeasureTypeLabel = Medida +comboAttributeTypeEmptyText = Seleccionar attributo... +comboAttributeTypeLabel = Atributo +comboLocaleTypeEmptyText = Seleccionar locale... +comboLocaleTypeLabel = Locale +comboDimensionTypeEmptyText = Seleccionar Codelist... +comboDimensionTypeLabel = Codelist +comboColumnReferenceTypeEmptyText = Seleccionar referencia... +comboColumnReferenceTypeLabel = Columna +comboColumnMappingEmptyText = Seleccionar mapping opcional... +comboColumnMappingLabel = Mapping +comboPeriodTypeEmptyText = Seleccionar período... +comboPeriodTypeLabel = Período +comboValueDataFormatEmptyText = Seleccionar el tamaño... +comboValueDataFormatLabel = Tamaño +applyBtnText = Aplica +applyBtnToolTip = Aplica Tipo \ No newline at end of file diff --git a/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypeMessages_it.properties b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypeMessages_it.properties new file mode 100644 index 0000000..efb3d7c --- /dev/null +++ b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypeMessages_it.properties @@ -0,0 +1,23 @@ +dialogHeadingText = Cambia Tipo della Colonna +comboColumnEmptyText = Seleziona una colonna... +comboColumnLabel = Colonna +comboColumnTypeCodeEmptyText = Seleziona tipo... +comboColumnTypeCodeLabel = Tipo +comboMeasureTypeEmptyText = Seleziona misura... +comboMeasureTypeLabel = Misura +comboAttributeTypeEmptyText = Seleziona attributo... +comboAttributeTypeLabel = Attributo +comboLocaleTypeEmptyText = Seleziona locale... +comboLocaleTypeLabel = Locale +comboDimensionTypeEmptyText = Seleziona Codelist... +comboDimensionTypeLabel = Codelist +comboColumnReferenceTypeEmptyText = Seleziona riferimento... +comboColumnReferenceTypeLabel = Colonna +comboColumnMappingEmptyText = Seleziona mapping opzionale... +comboColumnMappingLabel = Mapping +comboPeriodTypeEmptyText = Seleziona periodo... +comboPeriodTypeLabel = Periodo +comboValueDataFormatEmptyText = Seleziona formato... +comboValueDataFormatLabel = Formato +applyBtnText = Applica +applyBtnToolTip = Applica il Tipo alla Colonna diff --git a/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/DeleteColumnMessages.properties b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/DeleteColumnMessages.properties new file mode 100644 index 0000000..b9f799c --- /dev/null +++ b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/DeleteColumnMessages.properties @@ -0,0 +1,4 @@ +dialogHeadingText = Delete Columns +deleteBtnText = Delete +deleteBtnToolTip = Delete Columns +columnsLabel = Columns diff --git a/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/DeleteColumnMessages_es.properties b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/DeleteColumnMessages_es.properties new file mode 100644 index 0000000..c084023 --- /dev/null +++ b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/DeleteColumnMessages_es.properties @@ -0,0 +1,4 @@ +dialogHeadingText = Borrar Columnas +deleteBtnText = Borrar +deleteBtnToolTip = Borrar Columnas +columnsLabel = Columnas diff --git a/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/DeleteColumnMessages_it.properties b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/DeleteColumnMessages_it.properties new file mode 100644 index 0000000..ac7c860 --- /dev/null +++ b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/DeleteColumnMessages_it.properties @@ -0,0 +1,4 @@ +dialogHeadingText = Elimina Colonne +deleteBtnText = Elimina +deleteBtnToolTip = Elimina Colonne +columnsLabel = Colonne diff --git a/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/LabelColumnMessages.properties b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/LabelColumnMessages.properties new file mode 100644 index 0000000..a5c9538 --- /dev/null +++ b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/LabelColumnMessages.properties @@ -0,0 +1,9 @@ +dialogHeadingText = Label Columns +changeBtnText = Change +changeBtnToolTip = Change Columns Label +updatedLabels = Updated labels +nolabelText = nolabel +nolabelTextLabel = nolabel +insertValidLabels = Insert valid labels! +errorChangingTheColumnLabelHead = Error Changing The Column Label +errorChangingTheColumnLabel = Error in invocation of Change The Column Label operation! diff --git a/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/LabelColumnMessages_es.properties b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/LabelColumnMessages_es.properties new file mode 100644 index 0000000..bacfa43 --- /dev/null +++ b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/LabelColumnMessages_es.properties @@ -0,0 +1,9 @@ +dialogHeadingText = Etiquetas +changeBtnText = Cambiar +changeBtnToolTip = Cambiar Etiquetas +updatedLabels = Etiquetas Actualizan +nolabelText = noetiqueta +nolabelTextLabel = noetiqueta +insertValidLabels = Introducir etiquetas válidas! +errorChangingTheColumnLabelHead = Error en el Cambio de las Etiquetas +errorChangingTheColumnLabel = Error en la Operación de Cambio de las Etiquetas! diff --git a/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/LabelColumnMessages_it.properties b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/LabelColumnMessages_it.properties new file mode 100644 index 0000000..db1950a --- /dev/null +++ b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/LabelColumnMessages_it.properties @@ -0,0 +1,9 @@ +dialogHeadingText = Etichette +changeBtnText = Modifica +changeBtnToolTip = Modifica Etichette +updatedLabels = Etichette Aggiornate +nolabelText = senzaetichetta +nolabelTextLabel = senzaetichetta +insertValidLabels = Inserisci etichette valide! +errorChangingTheColumnLabelHead = Errore modificando l''etichette +errorChangingTheColumnLabel = Errore nell''invocazione dell''operazione di modifica etichette! diff --git a/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/Messages.properties b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/Messages.properties deleted file mode 100644 index c222555..0000000 --- a/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/Messages.properties +++ /dev/null @@ -1,2 +0,0 @@ -sendButton = Send -nameField = Enter your name \ No newline at end of file diff --git a/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/Messages_fr.properties b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/Messages_fr.properties deleted file mode 100644 index b4a7627..0000000 --- a/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/Messages_fr.properties +++ /dev/null @@ -1,2 +0,0 @@ -sendButton = Envoyer -nameField = Entrez votre nom \ No newline at end of file