move subdomain blocker to startTranslationCycle

desentio · Oct 22, 2024 · 7cca013 · 7cca013
1 parent 8a590ef
commit 7cca013
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/index.js b/index.js
@@ -29,17 +29,6 @@ async function getTranslations(window, apiKey, optsArgs = {}) {
       await createLanguageSelect(window, optsArgs);
     }
 
-    if (!window.isWorker && optsArgs.translationMode == "subdomain") {      
-      await renderSelectorState(window, { shouldUpdateActiveLang: true, delay: 0, shouldLog: false })
-
-      // dont translate anything on original site
-      if (!window.activeSubdomain) {
-        return window;
-      } else {
-        window.globalseoActiveLang = window.activeSubdomain;
-      }
-    }
-
     // handle google translate
     if (isBrowser() && (window.document.querySelector('html.translated-ltr') || window.document.querySelector('html.translated-rtl'))) return;
 

diff --git a/utils/translation/startTranslationCycle.js b/utils/translation/startTranslationCycle.js
@@ -2,6 +2,7 @@ const { getGlobalseoActiveLang, getGlobalseoOptions } = require("../configs");
 const { getLanguageFromLocalStorage } = require("../languages/getSelectedLanguage");
 const modifyHtmlStrings = require("./modifyHtmlStrings");
 const { debounce } = require("../debounce");
+const { renderSelectorState } = require("../selector/renderSelectorState");
 
 async function startTranslationCycle(window, node, apiKey, delay, shouldOptimizeSEO = false) {
   if (window.preventInitialTranslation) {
@@ -10,6 +11,17 @@ async function startTranslationCycle(window, node, apiKey, delay, shouldOptimize
   };
   const options = getGlobalseoOptions(window);
 
+  if (!window.isWorker && options.translationMode == "subdomain") {      
+    await renderSelectorState(window, { shouldUpdateActiveLang: true, delay: 0, shouldLog: false })
+
+    // dont translate anything on original site
+    if (!window.activeSubdomain) {
+      return window;
+    } else {
+      window.globalseoActiveLang = window.activeSubdomain;
+    }
+  }
+
   // replace src because nextjs will replace the whole html on rerender
   if (options.translationMode == "subdomain" && window.activeSubdomain) {
     // get all elements with src attribute