From c3febcfdee0221acf589f2c78b9a24d815993ed3 Mon Sep 17 00:00:00 2001
From: Tom Morris <tfmorris@gmail.com>
Date: Thu, 11 Feb 2021 13:56:41 -0500
Subject: [PATCH] Improve GData importer i18n - fixes #3312 (#3613)

---
 extensions/gdata/module/langs/translation-en.json      | 10 ++++------
 .../gdata/module/scripts/index/gdata-source-ui.js      |  7 +++----
 .../module/scripts/index/import-from-gdata-form.html   |  7 +++----
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/extensions/gdata/module/langs/translation-en.json b/extensions/gdata/module/langs/translation-en.json
index 7c9d9b001..11e5cb25f 100644
--- a/extensions/gdata/module/langs/translation-en.json
+++ b/extensions/gdata/module/langs/translation-en.json
@@ -5,13 +5,11 @@
     "gdata-import/import-by-url": "Import a <em>public</em> Google Spreadsheet by its URL:",
     "gdata-import/next->": "Next &raquo;",
     "gdata-import/auth-doc": "Authorized Documents",
-    "gdata-import/please": "Please",
-    "gdata-import/sign-in": "sign in and authorize",
-    "gdata-import/sign-out": "sign out",
-    "gdata-import/access-data": "access to your Google data.",
+    "gdata-import/please-signin": "Please sign in and authorize to access your Google data",
+    "gdata-import/sign-in": "Sign in",
+    "gdata-import/sign-out": "Sign out",
     "gdata-import/retrieving": "Retrieving Google Docs documents …",
-    "gdata-import/re-sign-in": "re-sign in",
-    "gdata-import/another-account": "with another account",
+    "gdata-import/re-sign-in-another": "Sign in with different account",
     "gdata-parsing/start-over": "&laquo; Start Over",
     "gdata-parsing/conf-pars": "Configure Parsing Options",
     "gdata-parsing/proj-name": "Project&nbsp;name",
diff --git a/extensions/gdata/module/scripts/index/gdata-source-ui.js b/extensions/gdata/module/scripts/index/gdata-source-ui.js
index 0d0fddc53..76b9caf1b 100644
--- a/extensions/gdata/module/scripts/index/gdata-source-ui.js
+++ b/extensions/gdata/module/scripts/index/gdata-source-ui.js
@@ -45,13 +45,12 @@ Refine.GDataSourceUI.prototype.attachUI = function(body) {
   $('#gdata-import').html($.i18n('gdata-import/import-by-url'));
   $('#gdata-next').html($.i18n('gdata-import/next->'));
   $('#gdata-auth-doc').text($.i18n('gdata-import/auth-doc'));
-  $('#gdata-please').text($.i18n('gdata-import/please'));
+  $('#gdata-please-signin').text($.i18n('gdata-import/please-signin'));
   $('#gdata-signin-btn').text($.i18n('gdata-import/sign-in'));
-  $('#gdata-access-data').text($.i18n('gdata-import/access-data'));
   $('#gdata-retrieving').text($.i18n('gdata-import/retrieving'));
   $('#gdata-signout').text($.i18n('gdata-import/sign-out'));
-  $('#gdata-resignin').text($.i18n('gdata-import/re-sign-in'));
-  $('#gdata-another-account').text($.i18n('gdata-import/another-account'));
+  $('#gdata-resignin').text($.i18n('gdata-import/sign-in'));
+  $('#gdata-re-signin-another').text($.i18n('gdata-import/re-sign-in-another'));
   
   var self = this;
   this._body.find('.gdata-signin.button').click(function() {
diff --git a/extensions/gdata/module/scripts/index/import-from-gdata-form.html b/extensions/gdata/module/scripts/index/import-from-gdata-form.html
index bb2518342..61e9c1ca8 100644
--- a/extensions/gdata/module/scripts/index/import-from-gdata-form.html
+++ b/extensions/gdata/module/scripts/index/import-from-gdata-form.html
@@ -14,16 +14,15 @@
     <h1 id="gdata-auth-doc"></h1>
     
     <div bind="signinPage" class="gdata-page">
-      <p><span id="gdata-please"></span> <button class="gdata-signin button button-primary" id="gdata-signin-btn"></button>
-        <span id="gdata-access-data"></p>
+      <p><span id="gdata-please-signin"></span> <button class="gdata-signin button button-primary" id="gdata-signin-btn"></button></p>
     </div>
     <div bind="progressPage" class="gdata-page">
       <p><img src="images/large-spinner.gif" /> <span id="gdata-retrieving"></span></p>
     </div>
     <div bind="listingPage" class="gdata-page grid-layout layout-normal"><table>
       <tr>
-        <td width="%"><button class="gdata-signout button" id="gdata-signout"></button></td>
-        <td><button class="gdata-signin button" id="gdata-resignin"></button> <span id="gdata-another-account"></span></td>
+        <td colspan="2"><span id="gdata-re-signin-another"></span><button class="gdata-signin button button-primary" id="gdata-resignin"></button>
+        <button class="gdata-signout button button-primary" id="gdata-signout"></button>
       </tr>
       <tr><td colspan="2"><div bind="listingContainer" class="grid-layout layout-tight gdata-document-container"></div></td></tr>
     </table></div>