From 8ea6f6e251d8411e09b9e4783feb8b7efacd6af1 Mon Sep 17 00:00:00 2001 From: Antonin Delpeuch Date: Thu, 13 Sep 2018 11:00:33 +0100 Subject: [PATCH 1/2] Fix mixup of dialog titles, closes #1657. --- main/webapp/modules/core/langs/translation-en.json | 3 ++- .../modules/core/scripts/dialogs/sql-exporter-dialog.js | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/main/webapp/modules/core/langs/translation-en.json b/main/webapp/modules/core/langs/translation-en.json index 0f4a0b88e..2ce411b04 100644 --- a/main/webapp/modules/core/langs/translation-en.json +++ b/main/webapp/modules/core/langs/translation-en.json @@ -237,7 +237,8 @@ "help": "Help", "opt-code-applied": "Option code successfully applied.", "error-apply-code": "Error applying option code", - "custom-tab-exp": "SQL Exporter", + "sql-exporter": "SQL Exporter", + "custom-tab-exp": "Custom Tabular Exporter", "content": "Content", "download": "Download", "upload": "Upload", diff --git a/main/webapp/modules/core/scripts/dialogs/sql-exporter-dialog.js b/main/webapp/modules/core/scripts/dialogs/sql-exporter-dialog.js index 3bea81a01..06ce916a1 100755 --- a/main/webapp/modules/core/scripts/dialogs/sql-exporter-dialog.js +++ b/main/webapp/modules/core/scripts/dialogs/sql-exporter-dialog.js @@ -48,7 +48,7 @@ function SqlExporterDialog(options) { this._dialog = $(DOM.loadHTML("core", "scripts/dialogs/sql-exporter-dialog.html")); this._elmts = DOM.bind(this._dialog); this._level = DialogSystem.showDialog(this._dialog); - this._elmts.dialogHeader.html($.i18n._('core-dialogs')["custom-tab-exp"]); + this._elmts.dialogHeader.html($.i18n._('core-dialogs')["sql-exporter"]); this._elmts.or_dialog_content.html($.i18n._('core-dialogs')["content"]); this._elmts.or_dialog_download.html($.i18n._('core-dialogs')["download"]); @@ -492,4 +492,4 @@ function SqlExporterDialog(options) { //alert('options:' + options); return options; }; - \ No newline at end of file + From 4298e13f02a927a13427db8c6cacb24c9d37d5fe Mon Sep 17 00:00:00 2001 From: Antonin Delpeuch Date: Thu, 13 Sep 2018 11:29:21 +0100 Subject: [PATCH 2/2] Change title of column selection dialog for transform all operation --- main/webapp/modules/core/langs/translation-en.json | 1 + main/webapp/modules/core/langs/translation-fr.json | 2 +- main/webapp/modules/core/langs/translation-it.json | 2 +- .../modules/core/scripts/dialogs/expression-column-dialog.js | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/main/webapp/modules/core/langs/translation-en.json b/main/webapp/modules/core/langs/translation-en.json index 2ce411b04..dffddfe4d 100644 --- a/main/webapp/modules/core/langs/translation-en.json +++ b/main/webapp/modules/core/langs/translation-en.json @@ -239,6 +239,7 @@ "error-apply-code": "Error applying option code", "sql-exporter": "SQL Exporter", "custom-tab-exp": "Custom Tabular Exporter", + "select-columns-dialog": "Select columns", "content": "Content", "download": "Download", "upload": "Upload", diff --git a/main/webapp/modules/core/langs/translation-fr.json b/main/webapp/modules/core/langs/translation-fr.json index 889073531..571b310af 100644 --- a/main/webapp/modules/core/langs/translation-fr.json +++ b/main/webapp/modules/core/langs/translation-fr.json @@ -249,7 +249,7 @@ "language": "Langue", "linear-plot": "Tracé linéaire", "excel-xml": "Excel en XML (.xlsx)", - "custom-tab-exp": "Exporteur SQL", + "sql-exporter": "Exporteur SQL", "custom-separator": "Séparateur personnalisé", "template-suffix": "Suffixe", "history": "Historique", diff --git a/main/webapp/modules/core/langs/translation-it.json b/main/webapp/modules/core/langs/translation-it.json index 659ad8dbe..77b929709 100644 --- a/main/webapp/modules/core/langs/translation-it.json +++ b/main/webapp/modules/core/langs/translation-it.json @@ -249,7 +249,7 @@ "opt-for": "Opzioni per", "linear-plot": "Grafico a linee", "excel-xml": "Excel in XML (.xlsx)", - "custom-tab-exp": "Exporter SQL", + "sql-exporter": "Exporter SQL", "custom-separator": "Separatore personalizzato", "template-suffix": "Suffisso", "history": "Storia", diff --git a/main/webapp/modules/core/scripts/dialogs/expression-column-dialog.js b/main/webapp/modules/core/scripts/dialogs/expression-column-dialog.js index 5f21259fa..2ba833950 100644 --- a/main/webapp/modules/core/scripts/dialogs/expression-column-dialog.js +++ b/main/webapp/modules/core/scripts/dialogs/expression-column-dialog.js @@ -31,7 +31,7 @@ ExpressionColumnDialog.prototype._createDialog = function() { this._level = DialogSystem.showDialog(this._dialog); - this._elmts.dialogHeader.html($.i18n._('core-dialogs')["custom-tab-exp"]); + this._elmts.dialogHeader.html($.i18n._('core-dialogs')["select-columns-dialog"]); this._elmts.or_dialog_content.html($.i18n._('core-dialogs')["content"]); this._elmts.or_dialog_selAndOrd.html($.i18n._('core-dialogs')["sel-and-ord"]); this._elmts.selectAllButton.html($.i18n._('core-buttons')["select-all"]);