Unify Settings on Import #285

3 files changed, 27 insertions, 12 deletions

diff --git a/src/assets/javascripts/translate/get_lingva_preferences.js b/src/assets/javascripts/translate/get_lingva_preferences.js
index f04ea3dc..40def6a5 100644
--- a/src/assets/javascripts/translate/get_lingva_preferences.js
+++ b/src/assets/javascripts/translate/get_lingva_preferences.js
@@ -2,9 +2,11 @@ window.browser = window.browser || window.chrome;
 
 browser.storage.local.set(
     {
-        ['lingva_lingva_chakra-ui-color-mode']: localStorage.getItem('chakra-ui-color-mode'),
-        lingva_lingva_isauto: localStorage.getItem('isauto'),
-        lingva_lingva_source: localStorage.getItem('source'),
-        lingva_lingva_target: localStorage.getItem('target'),
+        ['lingva_chakra-ui-color-mode']: localStorage.getItem('chakra-ui-color-mode'),
+        lingva_isauto: localStorage.getItem('isauto'),
+        lingva_source: localStorage.getItem('source'),
+        lingva_target: localStorage.getItem('target'),
     }
 )
+
+console.log(localStorage.getItem('target'));
\ No newline at end of file
diff --git a/src/assets/javascripts/translate/set_lingva_preferences.js b/src/assets/javascripts/translate/set_lingva_preferences.js
index 01a3b85e..a0f2ad87 100644
--- a/src/assets/javascripts/translate/set_lingva_preferences.js
+++ b/src/assets/javascripts/translate/set_lingva_preferences.js
@@ -10,10 +10,8 @@ browser.storage.local.get(
     r => {
         if (r['lingva_chakra-ui-color-mode'] !== undefined) localStorage.setItem('chakra-ui-color-mode', r['lingva_chakra-ui-color-mode']);
         if (r.lingva_isauto !== undefined) localStorage.setItem('isauto', r.lingva_isauto);
-        console.log('r.lingva_isauto', r.lingva_isauto, localStorage.getItem('isauto'))
         if (r.lingva_source !== undefined) localStorage.setItem('source', r.lingva_source);
         if (r.lingva_target !== undefined) localStorage.setItem('target', r.lingva_target);
-
         window.close();
     }
 )
diff --git a/src/assets/javascripts/translate/translate.js b/src/assets/javascripts/translate/translate.js
index bc93ec6c..0dccc848 100644
--- a/src/assets/javascripts/translate/translate.js
+++ b/src/assets/javascripts/translate/translate.js
@@ -94,7 +94,7 @@ function setRedirects(val) {
   })
 }
 
-function initLingvaLocalStorage(test, url, tabId) {
+function copyPasteLingvaLocalStorage(test, url, tabId) {
   return new Promise(async resolve => {
     await init();
     if (translateDisable || translateFrontend != 'lingva') { resolve(); return; }
@@ -129,7 +129,21 @@ function initLingvaLocalStorage(test, url, tabId) {
   )
 }
 
-function initSimplyTranslateCookies(test, from) {
+function pasteLingvaLocalStorage() {
+  return new Promise(async resolve => {
+    await init();
+    if (translateDisable || translateFrontend != 'lingva') { resolve(); return; }
+    let checkedInstances;
+    if (translateProtocol == 'normal') checkedInstances = [...lingvaNormalRedirectsChecks, ...lingvaNormalCustomRedirects];
+    if (translateProtocol == 'tor') checkedInstances = [...lingvaTorRedirectsChecks, ...lingvaTorCustomRedirects];
+    for (const to of checkedInstances)
+      browser.tabs.create({ url: to },
+        tab => browser.tabs.executeScript(tab.id, { file: "/assets/javascripts/translate/set_lingva_preferences.js", runAt: "document_start" }))
+    resolve();
+  })
+}
+
+function copyPasteSimplyTranslateCookies(test, from) {
   return new Promise(async resolve => {
     await init();
     const protocolHost = utils.protocolHost(from);
@@ -153,7 +167,7 @@ function initSimplyTranslateCookies(test, from) {
   )
 }
 
-function setSimplyTranslateCookies() {
+function pasteSimplyTranslateCookies() {
   return new Promise(async resolve => {
     await init();
     if (translateDisable || translateFrontend != 'simplyTranslate') { resolve(); return; }
@@ -281,9 +295,10 @@ function initDefaults() {
 }
 
 export default {
-  initSimplyTranslateCookies,
-  setSimplyTranslateCookies,
-  initLingvaLocalStorage,
+  copyPasteSimplyTranslateCookies,
+  pasteSimplyTranslateCookies,
+  copyPasteLingvaLocalStorage,
+  pasteLingvaLocalStorage,
   setRedirects,
   redirect,
   initDefaults,