diff --git a/extensions/gdata/module/langs/translation-en.json b/extensions/gdata/module/langs/translation-en.json index 64a4abf2e..49c992f8c 100644 --- a/extensions/gdata/module/langs/translation-en.json +++ b/extensions/gdata/module/langs/translation-en.json @@ -37,9 +37,10 @@ "gdata-source/updated": "Updated", "gdata-exporter/uploading": "Uploading…", "gdata-exporter/upload-error": "Upload error: ", - "gdata-exporter/upload-success": "Project was uploaded successfully to Google Drive with Id ", + "gdata-exporter/upload-success": "Project was uploaded successfully to Google Drive ", "gdata-exporter/new-spreadsheet": "A new Google spreadsheet", "gdata-exporter/enter-spreadsheet": "Enter a name for the new Google spreadsheet", + "gdata-exporter/enter-filename": "Enter a file name for the project export in Google Drive", "gdata-auth/authorize-label": "OpenRefine - Authorization", "gdata-auth/authorized-label": "Authorization process completed. Close this window and return to OpenRefine." } diff --git a/extensions/gdata/module/scripts/project/exporters.js b/extensions/gdata/module/scripts/project/exporters.js index 6a3f46256..f2860b764 100644 --- a/extensions/gdata/module/scripts/project/exporters.js +++ b/extensions/gdata/module/scripts/project/exporters.js @@ -92,11 +92,4 @@ $.i18n().load(dictionary, lang); handleUpload(options, exportAllRows, onDone, $.i18n('gdata-exporter/enter-spreadsheet')); } }); - CustomTabularExporterDialog.uploadTargets.push({ - id: 'gdata/fusion-table', - label: $.i18n('gdata-exporter/new-fusion'), - handler: function(options, exportAllRows, onDone) { - handleUpload(options, exportAllRows, onDone, $.i18n('gdata-exporter/enter-fusion')); - } - }); })(); diff --git a/extensions/gdata/src/com/google/refine/extension/gdata/SpreadsheetSerializer.java b/extensions/gdata/src/com/google/refine/extension/gdata/SpreadsheetSerializer.java index 769793dcd..effa4ef1a 100644 --- a/extensions/gdata/src/com/google/refine/extension/gdata/SpreadsheetSerializer.java +++ b/extensions/gdata/src/com/google/refine/extension/gdata/SpreadsheetSerializer.java @@ -117,7 +117,7 @@ final class SpreadsheetSerializer implements TabularSerializer { } public String getUrl() throws UnsupportedEncodingException { - String urlString= "https://docs.google.com/spreadsheets/d/" + spreadsheetId + "/edit#gid=0"; - return URLEncoder.encode(urlString, "UTF-8"); + String urlString = "https://docs.google.com/spreadsheets/d/" + spreadsheetId + "/edit#gid=0"; + return urlString; } } diff --git a/main/webapp/modules/core/scripts/project/exporters.js b/main/webapp/modules/core/scripts/project/exporters.js index bf0e821e6..5823f7a5f 100644 --- a/main/webapp/modules/core/scripts/project/exporters.js +++ b/main/webapp/modules/core/scripts/project/exporters.js @@ -187,7 +187,7 @@ ExporterManager.handlers.exportProject = function() { // save to google drive var doExportToGoogleDrive = function() { - var name = window.prompt(prompt, theProject.metadata.name); + var name = window.prompt($.i18n('gdata-exporter/enter-filename'), theProject.metadata.name); if (name) { var dismiss = DialogSystem.showBusy($.i18n('gdata-exporter/uploading')); Refine.postCSRF( @@ -201,7 +201,7 @@ ExporterManager.handlers.exportProject = function() { dismiss(); if (o.url) { - alert($.i18n('gdata-exporter/upload-success') + o.url); + alert($.i18n('gdata-exporter/upload-success')); } else { alert($.i18n('gdata-exporter/upload-error') + o.message) }