From f2d091d30851e3c66f5fafb6992f2b2f5a5a6b89 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Mon, 5 Oct 2015 16:23:45 +0000 Subject: [PATCH] Updated i18N support git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@119402 82a268e6-3cf1-43bd-a215-b396298e98cf --- distro/changelog.xml | 1 + .../user/td/client/TabularDataController.java | 14 ++++++-- .../client/TabularDataControllerMessages.java | 30 ++++++++++++++++++ .../client/resource/TabularDataResources.java | 12 ++++++- .../user/td/client/resource/sflag_en.png | Bin 0 -> 398 bytes .../user/td/client/resource/sflag_es.png | Bin 0 -> 432 bytes .../user/td/client/resource/sflag_it.png | Bin 0 -> 281 bytes .../user/td/client/ribbon/FileToolBar.java | 12 +++---- .../TabularDataControllerMessages.properties | 2 ++ ...abularDataControllerMessages_es.properties | 2 ++ ...abularDataControllerMessages_it.properties | 2 ++ .../user/td/client/resource/sflag_en.png | Bin 0 -> 398 bytes .../user/td/client/resource/sflag_es.png | Bin 0 -> 432 bytes .../user/td/client/resource/sflag_it.png | Bin 0 -> 281 bytes .../CurationToolBarMessages_es.properties | 12 +++---- .../ribbon/FileToolBarMessages_es.properties | 12 +++---- .../ModifyToolBarMessages_es.properties | 2 +- .../ribbon/RuleToolBarMessages_es.properties | 8 ++--- .../TemplateToolBarMessages_es.properties | 8 ++--- templates/changelog.xml | 1 + 20 files changed, 87 insertions(+), 31 deletions(-) create mode 100644 src/main/java/org/gcube/portlets/user/td/client/TabularDataControllerMessages.java create mode 100644 src/main/java/org/gcube/portlets/user/td/client/resource/sflag_en.png create mode 100644 src/main/java/org/gcube/portlets/user/td/client/resource/sflag_es.png create mode 100644 src/main/java/org/gcube/portlets/user/td/client/resource/sflag_it.png create mode 100644 src/main/resources/org/gcube/portlets/user/td/client/TabularDataControllerMessages.properties create mode 100644 src/main/resources/org/gcube/portlets/user/td/client/TabularDataControllerMessages_es.properties create mode 100644 src/main/resources/org/gcube/portlets/user/td/client/TabularDataControllerMessages_it.properties create mode 100644 src/main/resources/org/gcube/portlets/user/td/client/resource/sflag_en.png create mode 100644 src/main/resources/org/gcube/portlets/user/td/client/resource/sflag_es.png create mode 100644 src/main/resources/org/gcube/portlets/user/td/client/resource/sflag_it.png diff --git a/distro/changelog.xml b/distro/changelog.xml index 739fc45..f6906ee 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -2,6 +2,7 @@ Added support to WorkspaceExplorer [issue #428] + Updated i18N support diff --git a/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java b/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java index dd6012b..af1da0c 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java +++ b/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java @@ -33,8 +33,8 @@ import org.gcube.portlets.user.td.mapwidget.client.MapWidgetTD; import org.gcube.portlets.user.td.openwidget.client.TDOpen; import org.gcube.portlets.user.td.replacebyexternalwidget.client.ReplaceByExternalTD; import org.gcube.portlets.user.td.rulewidget.client.RuleActiveDialog; -import org.gcube.portlets.user.td.rulewidget.client.RuleOnColumnApplyDialog; import org.gcube.portlets.user.td.rulewidget.client.RuleDeleteDialog; +import org.gcube.portlets.user.td.rulewidget.client.RuleOnColumnApplyDialog; import org.gcube.portlets.user.td.rulewidget.client.RuleOpenDialog; import org.gcube.portlets.user.td.rulewidget.client.RuleShareDialog; import org.gcube.portlets.user.td.rulewidget.client.multicolumn.RuleOnTableApplyWizard; @@ -133,9 +133,17 @@ public class TabularDataController { * Grid TableId */ private TRId openTRIdAfterServerUpdate; + + /** + * Messages + * + */ + private TabularDataControllerMessages msgs; public TabularDataController() { eventBus = new SimpleEventBus(); + msgs = GWT.create(TabularDataControllerMessages.class); + callHello(); checkSession(); pendingTasksRetrieve(); @@ -1518,9 +1526,9 @@ public class TabularDataController { openWizard(); String title; if (switchState) { - title = "Switches Tabular Resource"; + title = msgs.openSwitchesTR(); } else { - title = "Open Tabular Resource"; + title = msgs.openTR(); } TDOpen tdOpen = new TDOpen(trId, title, eventBus); tdOpen.addListener(new WizardListener() { diff --git a/src/main/java/org/gcube/portlets/user/td/client/TabularDataControllerMessages.java b/src/main/java/org/gcube/portlets/user/td/client/TabularDataControllerMessages.java new file mode 100644 index 0000000..a34bcb7 --- /dev/null +++ b/src/main/java/org/gcube/portlets/user/td/client/TabularDataControllerMessages.java @@ -0,0 +1,30 @@ +package org.gcube.portlets.user.td.client; + +import com.google.gwt.i18n.client.Messages; + +/** + * + * @author giancarlo + * email: g.panichi@isti.cnr.it + * + */ +public interface TabularDataControllerMessages extends Messages { + + /** + * + * @return + */ + @DefaultMessage("Open Tabular Resource") + String openTR(); + + /** + * + * @return + */ + @DefaultMessage("Switches Tabular Resource") + String openSwitchesTR(); + + + + +} diff --git a/src/main/java/org/gcube/portlets/user/td/client/resource/TabularDataResources.java b/src/main/java/org/gcube/portlets/user/td/client/resource/TabularDataResources.java index 492c1c7..aea3d35 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/resource/TabularDataResources.java +++ b/src/main/java/org/gcube/portlets/user/td/client/resource/TabularDataResources.java @@ -587,7 +587,7 @@ public interface TabularDataResources extends ClientBundle { ImageResource geometryPoint(); @Source("flag_gb.png") - ImageResource flagGB(); + ImageResource flagEN(); @Source("flag_it.png") ImageResource flagIT(); @@ -595,6 +595,16 @@ public interface TabularDataResources extends ClientBundle { @Source("flag_es.png") ImageResource flagES(); + @Source("sflag_en.png") + ImageResource sflagEN(); + + @Source("sflag_it.png") + ImageResource sflagIT(); + + @Source("sflag_es.png") + ImageResource sflagES(); + + @Source("language_32.png") ImageResource language32(); diff --git a/src/main/java/org/gcube/portlets/user/td/client/resource/sflag_en.png b/src/main/java/org/gcube/portlets/user/td/client/resource/sflag_en.png new file mode 100644 index 0000000000000000000000000000000000000000..3da7bee7e39080b05751c8dd19985a05b101600b GIT binary patch literal 398 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~7b}mkL1&eNAy7!N#5JPCIX^cyHLrxhxhOTUBsE2$ zJhLQ2!QIn0AiR-J9H{7R|Ig|5&$s#9=E_N8 zKP>gVIXfpo+SZ2UpHTS)x2YcmpA}5|pq|#`&{`%Lrz;OTnFX_jUtB#RzfrnC{{G7J$VTBaZFOIagDbse>O5i5`**SZuS$sp z-xT3@XZ5Wt&ZZW~cuhD~K2`ALql`Vmz9vG2al0cPnoWMn9=Ea8tx?pwcKwms4A|gZio~}sXhE3NvI_K&q zB&wTnO$+OK#LcmnxtSDSXk6Z|-lHDm7Y@)t8>$+L6yT?;y9-jB{#2 z)xmrcJk>JWy11$gru(b(E$VQ3P#&{b?uX#*9fy-XwFPngPyf?x-#Aqkutof&v>~%Ur{io-uA?s&`6{*- z-(j&kkaHo5BcAuvf1XQKK2JO|E`7UR*yY4lJHub{v)7h62PKX@KJdHZTH1B{#rdyz Wf^1WiI+cI{$>8bg=d#Wzp$Pyx=%u9q literal 0 HcmV?d00001 diff --git a/src/main/java/org/gcube/portlets/user/td/client/resource/sflag_it.png b/src/main/java/org/gcube/portlets/user/td/client/resource/sflag_it.png new file mode 100644 index 0000000000000000000000000000000000000000..ce62c97047fb0d7461645d2257d98d88a471ac06 GIT binary patch literal 281 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~7b}m6!tI`8lYl~!C9V-A&iT2ysd*&~&PAz-C8;S2 z<(VZJ3hti10pX2&;y^`>o-U3d7N_4{+Q@k*K&17dzj8!W#{|YTxpNNaZC%^Fqk(&e zOPa@2Un2)DMPU`+mi9d@OD05AJUFnI{oHw7J@4$V8}An!5au_T=+`6@$`kRZmG_ol ze7l}jfHLo<;P_p~xn45{NT12Sk;j*?>0g6B!=!t``^;7u>)l|xDJR)i7bJUHU1;hP TciyK!$1r%h`njxgN@xNAjZ0py literal 0 HcmV?d00001 diff --git a/src/main/java/org/gcube/portlets/user/td/client/ribbon/FileToolBar.java b/src/main/java/org/gcube/portlets/user/td/client/ribbon/FileToolBar.java index d4f9ec7..3f382a5 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/ribbon/FileToolBar.java +++ b/src/main/java/org/gcube/portlets/user/td/client/ribbon/FileToolBar.java @@ -527,12 +527,12 @@ public class FileToolBar { private Menu createLanguageMenu() { Menu menuReplace = new Menu(); - enItem = new MenuItem(msgs.english(), - TabularDataResources.INSTANCE.flagGB()); - itItem = new MenuItem(msgs.italian(), - TabularDataResources.INSTANCE.flagIT()); - esItem = new MenuItem(msgs.spanish(), - TabularDataResources.INSTANCE.flagES()); + enItem = new MenuItem(msgs.english()); + // TabularDataResources.INSTANCE.sflagEN()); + itItem = new MenuItem(msgs.italian()); + // TabularDataResources.INSTANCE.sflagIT()); + esItem = new MenuItem(msgs.spanish()); + // TabularDataResources.INSTANCE.sflagES()); enItem .addSelectionHandler(new SelectionHandler() { diff --git a/src/main/resources/org/gcube/portlets/user/td/client/TabularDataControllerMessages.properties b/src/main/resources/org/gcube/portlets/user/td/client/TabularDataControllerMessages.properties new file mode 100644 index 0000000..00dbe8f --- /dev/null +++ b/src/main/resources/org/gcube/portlets/user/td/client/TabularDataControllerMessages.properties @@ -0,0 +1,2 @@ +openTR = Open Tabular Resource +openSwitchesTR = Switches Tabular Resource diff --git a/src/main/resources/org/gcube/portlets/user/td/client/TabularDataControllerMessages_es.properties b/src/main/resources/org/gcube/portlets/user/td/client/TabularDataControllerMessages_es.properties new file mode 100644 index 0000000..9138bbc --- /dev/null +++ b/src/main/resources/org/gcube/portlets/user/td/client/TabularDataControllerMessages_es.properties @@ -0,0 +1,2 @@ +openTR = Abrir Tabular Resource +openSwitchesTR = Cambiar Tabular Resource \ No newline at end of file diff --git a/src/main/resources/org/gcube/portlets/user/td/client/TabularDataControllerMessages_it.properties b/src/main/resources/org/gcube/portlets/user/td/client/TabularDataControllerMessages_it.properties new file mode 100644 index 0000000..a27fa2d --- /dev/null +++ b/src/main/resources/org/gcube/portlets/user/td/client/TabularDataControllerMessages_it.properties @@ -0,0 +1,2 @@ +openTR = Apri Tabular Resource +openSwitchesTR = Cambia Tabular Resource diff --git a/src/main/resources/org/gcube/portlets/user/td/client/resource/sflag_en.png b/src/main/resources/org/gcube/portlets/user/td/client/resource/sflag_en.png new file mode 100644 index 0000000000000000000000000000000000000000..3da7bee7e39080b05751c8dd19985a05b101600b GIT binary patch literal 398 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~7b}mkL1&eNAy7!N#5JPCIX^cyHLrxhxhOTUBsE2$ zJhLQ2!QIn0AiR-J9H{7R|Ig|5&$s#9=E_N8 zKP>gVIXfpo+SZ2UpHTS)x2YcmpA}5|pq|#`&{`%Lrz;OTnFX_jUtB#RzfrnC{{G7J$VTBaZFOIagDbse>O5i5`**SZuS$sp z-xT3@XZ5Wt&ZZW~cuhD~K2`ALql`Vmz9vG2al0cPnoWMn9=Ea8tx?pwcKwms4A|gZio~}sXhE3NvI_K&q zB&wTnO$+OK#LcmnxtSDSXk6Z|-lHDm7Y@)t8>$+L6yT?;y9-jB{#2 z)xmrcJk>JWy11$gru(b(E$VQ3P#&{b?uX#*9fy-XwFPngPyf?x-#Aqkutof&v>~%Ur{io-uA?s&`6{*- z-(j&kkaHo5BcAuvf1XQKK2JO|E`7UR*yY4lJHub{v)7h62PKX@KJdHZTH1B{#rdyz Wf^1WiI+cI{$>8bg=d#Wzp$Pyx=%u9q literal 0 HcmV?d00001 diff --git a/src/main/resources/org/gcube/portlets/user/td/client/resource/sflag_it.png b/src/main/resources/org/gcube/portlets/user/td/client/resource/sflag_it.png new file mode 100644 index 0000000000000000000000000000000000000000..ce62c97047fb0d7461645d2257d98d88a471ac06 GIT binary patch literal 281 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~7b}m6!tI`8lYl~!C9V-A&iT2ysd*&~&PAz-C8;S2 z<(VZJ3hti10pX2&;y^`>o-U3d7N_4{+Q@k*K&17dzj8!W#{|YTxpNNaZC%^Fqk(&e zOPa@2Un2)DMPU`+mi9d@OD05AJUFnI{oHw7J@4$V8}An!5au_T=+`6@$`kRZmG_ol ze7l}jfHLo<;P_p~xn45{NT12Sk;j*?>0g6B!=!t``^;7u>)l|xDJR)i7bJUHU1;hP TciyK!$1r%h`njxgN@xNAjZ0py literal 0 HcmV?d00001 diff --git a/src/main/resources/org/gcube/portlets/user/td/client/ribbon/CurationToolBarMessages_es.properties b/src/main/resources/org/gcube/portlets/user/td/client/ribbon/CurationToolBarMessages_es.properties index 4a96c2c..19d95ab 100644 --- a/src/main/resources/org/gcube/portlets/user/td/client/ribbon/CurationToolBarMessages_es.properties +++ b/src/main/resources/org/gcube/portlets/user/td/client/ribbon/CurationToolBarMessages_es.properties @@ -1,8 +1,8 @@ validationGroupHeadingText = Validación validationsShowButton = Muestra validationsShowButtonToolTip = Muestra Validaciones -validationsDeleteButton = Eliminar -validationsDeleteButtonToolTip = Elimina validaciones +validationsDeleteButton = Borrar +validationsDeleteButtonToolTip = Borrar validaciones duplicateDetectionButton = Detección Duplicados duplicateDetectionButtonToolTip = Detección de duplicados structureGroupHeadingText = Estructura @@ -16,8 +16,8 @@ columnTypeButton = Tipo Columna columnTypeButtonToolTip = Cambio tipo de columna addColumnButton = Añadir addColumnButtonToolTip = Añadir la columna -deleteColumnButton = Eliminar -deleteColumnButtonToolTip = Eliminar columna +deleteColumnButton = Borrar +deleteColumnButtonToolTip = Borrar columna splitColumnButton = Dividida splitColumnButtonToolTip = Columna Dividida mergeColumnButton = Fusionar @@ -27,7 +27,7 @@ denormalizeButtonToolTip = Desnormalizar normalizeButton = Normalizar normalizeButtonToolTip = Normalizar helperGroupHeadingText = Asistente -extractCodelistButton = Extracto Codelist -extractCodelistButtonToolTip = Extracto Codelist +extractCodelistButton = Extraer Codelist +extractCodelistButtonToolTip = Extraer Codelist codelistMappingButton = Mapa Importación codelistMappingButtonToolTip = Codelist mapa importación \ No newline at end of file diff --git a/src/main/resources/org/gcube/portlets/user/td/client/ribbon/FileToolBarMessages_es.properties b/src/main/resources/org/gcube/portlets/user/td/client/ribbon/FileToolBarMessages_es.properties index 5644403..3042afe 100644 --- a/src/main/resources/org/gcube/portlets/user/td/client/ribbon/FileToolBarMessages_es.properties +++ b/src/main/resources/org/gcube/portlets/user/td/client/ribbon/FileToolBarMessages_es.properties @@ -1,14 +1,14 @@ fileGroupHeadingText = Tabular Resource -openButton = Abre -openButtonToolTip = Abre Tabular Resource -closeButton = Cerca de todo +openButton = Abrir +openButtonToolTip = Abrir Tabular Resource +closeButton = Cerrar Todo closeButtonToolTip = Cerrar todas las Tabular Resources cloneButton = Clon cloneButtonToolTip = Clon Tabular Resource -shareButton = Cuota -shareButtonToolTip = Cuota la Tabular Resource +shareButton = Compartir +shareButtonToolTip = Compartir la Tabular Resource deleteButton = Borrar -deleteButtonToolTip = Eliminar la Tabular Resource +deleteButtonToolTip = Borrar la Tabular Resource propertiesButton = Propiedades propertiesButtonToolTip = Muestra las propiedades importGroupHeadingText = Importaciòn diff --git a/src/main/resources/org/gcube/portlets/user/td/client/ribbon/ModifyToolBarMessages_es.properties b/src/main/resources/org/gcube/portlets/user/td/client/ribbon/ModifyToolBarMessages_es.properties index 41c5235..7cce0ba 100644 --- a/src/main/resources/org/gcube/portlets/user/td/client/ribbon/ModifyToolBarMessages_es.properties +++ b/src/main/resources/org/gcube/portlets/user/td/client/ribbon/ModifyToolBarMessages_es.properties @@ -7,7 +7,7 @@ addRowButton = Añadir addRowButtonToolTip = Añadir fila filterButton = Filtrar filterButtonToolTip = Filtrar líneas -tableGroupHeadingText = Mesa +tableGroupHeadingText = Tabla groupbyButton = Agrupar groupbyButtonToolTip = Realiza grupo en datos timeAggregationButton = Agregación Temporal diff --git a/src/main/resources/org/gcube/portlets/user/td/client/ribbon/RuleToolBarMessages_es.properties b/src/main/resources/org/gcube/portlets/user/td/client/ribbon/RuleToolBarMessages_es.properties index 5264711..49f177e 100644 --- a/src/main/resources/org/gcube/portlets/user/td/client/ribbon/RuleToolBarMessages_es.properties +++ b/src/main/resources/org/gcube/portlets/user/td/client/ribbon/RuleToolBarMessages_es.properties @@ -1,10 +1,10 @@ ruleGroupHeadingText = Gestionar -ruleOpenButton = Abre -ruleOpenButtonToolTip = Abre +ruleOpenButton = Abrir +ruleOpenButtonToolTip = Abrir ruleDeleteButton = Borrar ruleDeleteButtonToolTip = Borrar -ruleShareButton = Cuota -ruleShareButtonToolTip = Cuota +ruleShareButton = Compartir +ruleShareButtonToolTip = Compartir ruleActiveButton = Activo ruleActiveToolTip = Activo ruleOnColumnGroupHeadingText = On Columna diff --git a/src/main/resources/org/gcube/portlets/user/td/client/ribbon/TemplateToolBarMessages_es.properties b/src/main/resources/org/gcube/portlets/user/td/client/ribbon/TemplateToolBarMessages_es.properties index adaff8d..e460c08 100644 --- a/src/main/resources/org/gcube/portlets/user/td/client/ribbon/TemplateToolBarMessages_es.properties +++ b/src/main/resources/org/gcube/portlets/user/td/client/ribbon/TemplateToolBarMessages_es.properties @@ -1,11 +1,11 @@ templateGroupHeadingText = Gestionar templateNewButton = Nuevo templateNewButtonToolTip = Nuevo -templateOpenButton = Abre -templateOpenButtonToolTip = Abre +templateOpenButton = Abrir +templateOpenButtonToolTip = Abrir templateDeleteButton = Borrar templateDeleteButtonToolTip = Borrar templateApplyButton = Aplicar templateApplyButtonToolTip = Aplicar -templateShareButton = Cuota -templateShareButtonToolTip = Cuota \ No newline at end of file +templateShareButton = Compartir +templateShareButtonToolTip = Compartir \ No newline at end of file diff --git a/templates/changelog.xml b/templates/changelog.xml index 739fc45..f6906ee 100644 --- a/templates/changelog.xml +++ b/templates/changelog.xml @@ -2,6 +2,7 @@ Added support to WorkspaceExplorer [issue #428] + Updated i18N support