change localstorage check to try to address #297

i18next · Feb 14, 2025 · c24ea17 · c24ea17 · danielrentz · Feb 20, 2025
1 parent 9d765ed
commit c24ea17
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 8.0.3
+
+- change localstorage check to try to address [297](https://github.com/i18next/i18next-browser-languageDetector/issues/297)
+
 ### 8.0.2
 
 - fix for when passed services are null, should address [296](https://github.com/i18next/i18next-browser-languageDetector/issues/296)

diff --git a/i18nextBrowserLanguageDetector.js b/i18nextBrowserLanguageDetector.js
@@ -178,7 +178,7 @@
       let {
         lookupLocalStorage
       } = _ref;
-      if (lookupLocalStorage && localStorageAvailable()) {
+      if (localStorageAvailable() && lookupLocalStorage) {
         return window.localStorage.getItem(lookupLocalStorage) || undefined; // Undefined ensures type consistency with the previous version of this function
       }
       return undefined;
@@ -188,7 +188,7 @@
       let {
         lookupLocalStorage
       } = _ref2;
-      if (lookupLocalStorage && localStorageAvailable()) {
+      if (localStorageAvailable() && lookupLocalStorage) {
         window.localStorage.setItem(lookupLocalStorage, lng);
       }
     }

diff --git a/i18nextBrowserLanguageDetector.min.js b/i18nextBrowserLanguageDetector.min.js
diff --git a/src/browserLookups/localStorage.js b/src/browserLookups/localStorage.js
@@ -19,15 +19,15 @@ export default {
 
   // Deconstruct the options object and extract the lookupLocalStorage property
   lookup({ lookupLocalStorage }) {
-    if (lookupLocalStorage && localStorageAvailable()) {
+    if (localStorageAvailable() && lookupLocalStorage) {
       return window.localStorage.getItem(lookupLocalStorage) || undefined; // Undefined ensures type consistency with the previous version of this function
     }
     return undefined;
   },
 
   // Deconstruct the options object and extract the lookupLocalStorage property
   cacheUserLanguage(lng, { lookupLocalStorage }) {
-    if (lookupLocalStorage && localStorageAvailable()) {
+    if (localStorageAvailable() && lookupLocalStorage) {
       window.localStorage.setItem(lookupLocalStorage, lng);
     }
   }