Fixed settings theme and translation flashing #286

24 files changed, 24 insertions, 38 deletions

diff --git a/src/assets/javascripts/helpers/general.js b/src/assets/javascripts/general.js
index 199d884c..199d884c 100644
--- a/src/assets/javascripts/helpers/general.js
+++ b/src/assets/javascripts/general.js
diff --git a/src/assets/javascripts/helpers/imgur.js b/src/assets/javascripts/imgur.js
index 9f93f362..9f93f362 100644
--- a/src/assets/javascripts/helpers/imgur.js
+++ b/src/assets/javascripts/imgur.js
diff --git a/src/assets/javascripts/helpers/instagram.js b/src/assets/javascripts/instagram.js
index f5c54b3a..f5c54b3a 100644
--- a/src/assets/javascripts/helpers/instagram.js
+++ b/src/assets/javascripts/instagram.js
diff --git a/src/assets/javascripts/helpers/lbry.js b/src/assets/javascripts/lbry.js
index b44cc738..b44cc738 100644
--- a/src/assets/javascripts/helpers/lbry.js
+++ b/src/assets/javascripts/lbry.js
diff --git a/src/assets/javascripts/localise.js b/src/assets/javascripts/localise.js
index 752a6dd3..a4bbca92 100644
--- a/src/assets/javascripts/localise.js
+++ b/src/assets/javascripts/localise.js
@@ -1,39 +1,31 @@
 window.browser = window.browser || window.chrome;
 
-function getMessage(tag) {
-  return tag.replace(/__MSG_(\w+)__/g, function (_match, v1) {
-    return v1 ? browser.i18n.getMessage(v1) : null;
-  });
-}
-
 function localisePage() {
-  let elements = document.querySelectorAll("[data-localise]");
+  function getMessage(tag) {
+    return tag.replace(/__MSG_(\w+)__/g, (_match, v1) => {
+      return v1 ? browser.i18n.getMessage(v1) : null;
+    });
+  }
 
+  const elements = document.querySelectorAll("[data-localise]");
   for (let i in elements)
     if (elements.hasOwnProperty(i)) {
-      let obj = elements[i];
-      let tag = obj.getAttribute("data-localise").toString();
-
-      let msg = getMessage(tag);
-
+      const obj = elements[i];
+      const tag = obj.getAttribute("data-localise").toString();
+      const msg = getMessage(tag);
       if (msg && msg !== tag) obj.textContent = msg;
     }
 
-  let placeholders = document.querySelectorAll("[data-localise-placeholder]");
-
+  const placeholders = document.querySelectorAll("[data-localise-placeholder]");
   for (let i in placeholders)
     if (placeholders.hasOwnProperty(i)) {
-      let obj = placeholders[i];
-      let tag = obj.getAttribute("data-localise-placeholder").toString();
-
-      let msg = getMessage(tag);
-
+      const obj = placeholders[i];
+      const tag = obj.getAttribute("data-localise-placeholder").toString();
+      const msg = getMessage(tag);
       if (msg && msg !== tag) obj.placeholder = msg;
     }
 }
 
-localisePage();
-
 export default {
   localisePage
 }
diff --git a/src/assets/javascripts/helpers/maps.js b/src/assets/javascripts/maps.js
index 3ab5e2b6..3ab5e2b6 100644
--- a/src/assets/javascripts/helpers/maps.js
+++ b/src/assets/javascripts/maps.js
diff --git a/src/assets/javascripts/helpers/medium.js b/src/assets/javascripts/medium.js
index 7be6b0d1..7be6b0d1 100644
--- a/src/assets/javascripts/helpers/medium.js
+++ b/src/assets/javascripts/medium.js
diff --git a/src/assets/javascripts/helpers/peertube.js b/src/assets/javascripts/peertube.js
index ed15bce9..ed15bce9 100644
--- a/src/assets/javascripts/helpers/peertube.js
+++ b/src/assets/javascripts/peertube.js
diff --git a/src/assets/javascripts/helpers/reddit.js b/src/assets/javascripts/reddit.js
index 0735ba64..0735ba64 100644
--- a/src/assets/javascripts/helpers/reddit.js
+++ b/src/assets/javascripts/reddit.js
diff --git a/src/assets/javascripts/helpers/search.js b/src/assets/javascripts/search.js
index b32a8141..b32a8141 100644
--- a/src/assets/javascripts/helpers/search.js
+++ b/src/assets/javascripts/search.js
diff --git a/src/assets/javascripts/helpers/sendTargets.js b/src/assets/javascripts/sendTargets.js
index a3e87268..a3e87268 100644
--- a/src/assets/javascripts/helpers/sendTargets.js
+++ b/src/assets/javascripts/sendTargets.js
diff --git a/src/assets/javascripts/helpers/tiktok.js b/src/assets/javascripts/tiktok.js
index 750744e6..750744e6 100644
--- a/src/assets/javascripts/helpers/tiktok.js
+++ b/src/assets/javascripts/tiktok.js
diff --git a/src/assets/javascripts/helpers/translate/get_lingva_preferences.js b/src/assets/javascripts/translate/get_lingva_preferences.js
index f04ea3dc..f04ea3dc 100644
--- a/src/assets/javascripts/helpers/translate/get_lingva_preferences.js
+++ b/src/assets/javascripts/translate/get_lingva_preferences.js
diff --git a/src/assets/javascripts/helpers/translate/set_lingva_preferences.js b/src/assets/javascripts/translate/set_lingva_preferences.js
index 01a3b85e..01a3b85e 100644
--- a/src/assets/javascripts/helpers/translate/set_lingva_preferences.js
+++ b/src/assets/javascripts/translate/set_lingva_preferences.js
diff --git a/src/assets/javascripts/helpers/translate/translate.js b/src/assets/javascripts/translate/translate.js
index 74400040..3c8f9222 100644
--- a/src/assets/javascripts/helpers/translate/translate.js
+++ b/src/assets/javascripts/translate/translate.js
@@ -109,7 +109,7 @@ function initLingvaLocalStorage(test, url, tabId) {
     if (!test) {
       browser.tabs.executeScript(
         tabId,
-        { file: "/assets/javascripts/helpers/translate/get_lingva_preferences.js", runAt: "document_start" }
+        { file: "/assets/javascripts/translate/get_lingva_preferences.js", runAt: "document_start" }
       );
 
       let checkedInstances;
@@ -121,7 +121,7 @@ function initLingvaLocalStorage(test, url, tabId) {
       for (const to of checkedInstances)
         browser.tabs.create(
           { url: to },
-          tab => browser.tabs.executeScript(tab.id, { file: "/assets/javascripts/helpers/translate/set_lingva_preferences.js", runAt: "document_start" })
+          tab => browser.tabs.executeScript(tab.id, { file: "/assets/javascripts/translate/set_lingva_preferences.js", runAt: "document_start" })
         );
     }
     resolve(true);
diff --git a/src/assets/javascripts/helpers/twitter.js b/src/assets/javascripts/twitter.js
index dc48f9b1..d03c269f 100644
--- a/src/assets/javascripts/helpers/twitter.js
+++ b/src/assets/javascripts/twitter.js
@@ -106,7 +106,7 @@ function reverse(url) {
   return new Promise(async resolve => {
     await init();
     const protocolHost = utils.protocolHost(url);
-    if (!all().includes(protocolHost)) { resolve; return; }
+    if (!all().includes(protocolHost)) { resolve(); return; }
     resolve(`https://twitter.com${url.pathname}${url.search}`);
   })
 }
diff --git a/src/assets/javascripts/helpers/utils.js b/src/assets/javascripts/utils.js
index 16fdaae7..f1f18d9f 100644
--- a/src/assets/javascripts/helpers/utils.js
+++ b/src/assets/javascripts/utils.js
@@ -12,7 +12,7 @@ import lbryHelper from "./lbry.js";
 import sendTargetsHelper from "./sendTargets.js";
 import tiktokHelper from "./tiktok.js";
 import imgurHelper from "./imgur.js";
-import localise from '../localise.js'
+import localise from './localise.js'
 
 function getRandomInstance(instances) {
   return instances[~~(instances.length * Math.random())];
@@ -209,10 +209,6 @@ async function processDefaultCustomInstances(target, name, protocol, document) {
   })
 }
 
-function isRtl() {
-  return ["ar", "iw", "ku", "fa", "ur"].includes(browser.i18n.getUILanguage())
-}
-
 function getIp(href) {
   return new Promise(resolve => {
     let host = new URL(href).hostname;
@@ -315,6 +311,7 @@ function copyRaw(test, copyRawElement) {
           let url;
           try { url = new URL(currTab.url); }
           catch { resolve(); return; }
+
           let newUrl = await youtubeHelper.reverse(url);
           if (!newUrl) newUrl = await twitterHelper.reverse(url);
           if (!newUrl) newUrl = await instagramHelper.reverse(url);
@@ -328,7 +325,7 @@ function copyRaw(test, copyRawElement) {
             if (copyRawElement) {
               const textElement = copyRawElement.getElementsByTagName('h4')[0]
               const oldHtml = textElement.innerHTML;
-              textElement.innerHTML = 'Copied';
+              textElement.innerHTML = browser.i18n.getMessage('copied');
               setTimeout(() => textElement.innerHTML = oldHtml, 1000);
             }
           } else resolve()
@@ -446,7 +443,6 @@ export default {
   updateInstances,
   protocolHost,
   processDefaultCustomInstances,
-  isRtl,
   latency,
   copyCookie,
   getCookiesFromStorage,
diff --git a/src/assets/javascripts/helpers/wikipedia.js b/src/assets/javascripts/wikipedia.js
index 868bb01c..868bb01c 100644
--- a/src/assets/javascripts/helpers/wikipedia.js
+++ b/src/assets/javascripts/wikipedia.js
diff --git a/src/assets/javascripts/helpers/youtube/get_pipedMaterial_preferences.js b/src/assets/javascripts/youtube/get_pipedMaterial_preferences.js
index 9d052f62..9d052f62 100644
--- a/src/assets/javascripts/helpers/youtube/get_pipedMaterial_preferences.js
+++ b/src/assets/javascripts/youtube/get_pipedMaterial_preferences.js
diff --git a/src/assets/javascripts/helpers/youtube/get_piped_preferences.js b/src/assets/javascripts/youtube/get_piped_preferences.js
index 417d64df..417d64df 100644
--- a/src/assets/javascripts/helpers/youtube/get_piped_preferences.js
+++ b/src/assets/javascripts/youtube/get_piped_preferences.js
diff --git a/src/assets/javascripts/helpers/youtube/set_pipedMaterial_preferences.js b/src/assets/javascripts/youtube/set_pipedMaterial_preferences.js
index 7415255a..7415255a 100644
--- a/src/assets/javascripts/helpers/youtube/set_pipedMaterial_preferences.js
+++ b/src/assets/javascripts/youtube/set_pipedMaterial_preferences.js
diff --git a/src/assets/javascripts/helpers/youtube/set_piped_preferences.js b/src/assets/javascripts/youtube/set_piped_preferences.js
index d5ce49ff..d5ce49ff 100644
--- a/src/assets/javascripts/helpers/youtube/set_piped_preferences.js
+++ b/src/assets/javascripts/youtube/set_piped_preferences.js
diff --git a/src/assets/javascripts/helpers/youtube/youtube.js b/src/assets/javascripts/youtube/youtube.js
index 564e99c0..f8227e90 100644
--- a/src/assets/javascripts/helpers/youtube/youtube.js
+++ b/src/assets/javascripts/youtube/youtube.js
@@ -231,9 +231,7 @@ function reverse(url) {
   return new Promise(async resolve => {
     await init();
     const protocolHost = utils.protocolHost(url);
-    const instances = all();
-    if (!instances.includes(protocolHost)) { resolve(); return; }
-
+    if (!all().includes(protocolHost)) { resolve(); return; }
     resolve(`https://youtube.com${url.pathname}${url.search}`);
   })
 }
@@ -378,7 +376,7 @@ function initPipedLocalStorage(test, url, tabId) {
 
     if (!test) {
 
-      browser.tabs.executeScript(tabId, { file: "/assets/javascripts/helpers/youtube/get_piped_preferences.js", runAt: "document_start" });
+      browser.tabs.executeScript(tabId, { file: "/assets/javascripts/youtube/get_piped_preferences.js", runAt: "document_start" });
 
       let checkedInstances;
       if (youtubeProtocol == 'normal') checkedInstances = [...pipedNormalCustomRedirects, ...pipedNormalRedirectsChecks]
@@ -387,7 +385,7 @@ function initPipedLocalStorage(test, url, tabId) {
       if (i !== -1) checkedInstances.splice(i, 1);
       for (const to of checkedInstances) {
         browser.tabs.create({ url: to },
-          tab => browser.tabs.executeScript(tab.id, { file: "/assets/javascripts/helpers/youtube/set_piped_preferences.js", runAt: "document_start" }))
+          tab => browser.tabs.executeScript(tab.id, { file: "/assets/javascripts/youtube/set_piped_preferences.js", runAt: "document_start" }))
       }
     }
     resolve(true);
@@ -407,7 +405,7 @@ function initPipedMaterialLocalStorage(test, url, tabId,) {
     ].includes(protocolHost)) { resolve(); return; }
 
     if (!test) {
-      browser.tabs.executeScript(tabId, { file: "/assets/javascripts/helpers/youtube/get_pipedMaterial_preferences.js", runAt: "document_start" });
+      browser.tabs.executeScript(tabId, { file: "/assets/javascripts/youtube/get_pipedMaterial_preferences.js", runAt: "document_start" });
 
       let checkedInstances;
       if (youtubeProtocol == 'normal') checkedInstances = [...pipedMaterialNormalRedirectsChecks, ...pipedMaterialNormalCustomRedirects]
@@ -417,7 +415,7 @@ function initPipedMaterialLocalStorage(test, url, tabId,) {
       for (const to of checkedInstances)
         browser.tabs.create(
           { url: to },
-          tab => browser.tabs.executeScript(tab.id, { file: "/assets/javascripts/helpers/youtube/set_pipedMaterial_preferences.js", runAt: "document_start" })
+          tab => browser.tabs.executeScript(tab.id, { file: "/assets/javascripts/youtube/set_pipedMaterial_preferences.js", runAt: "document_start" })
         );
     }
     resolve(true);
diff --git a/src/assets/javascripts/helpers/youtubeMusic.js b/src/assets/javascripts/youtubeMusic.js
index 68fa4f24..68fa4f24 100644
--- a/src/assets/javascripts/helpers/youtubeMusic.js
+++ b/src/assets/javascripts/youtubeMusic.js