@tolgee/core 4.1.0 → 4.2.1

package/dist/tolgee.umd.js

@@ -134,22 +134,10 @@
                 if ((_a = this.config) === null || _a === void 0 ? void 0 : _a.forceLanguage) {
                     return this.config.forceLanguage;
                 }
-                if (this._currentLanguage) {
-                    return this._currentLanguage;
+                if (!this._currentLanguage) {
+                    this._currentLanguage = this.getInitialLanguage();
                 }
-                if (this.config.languageStore) {
-                    var storedLanguage = this.getStoredLanguage();
-                    if (storedLanguage) {
-                        return storedLanguage;
-                    }
-                }
-                if (this.config.languageDetect) {
-                    var detectedLanguage = this.getLanguageByNavigator();
-                    if (detectedLanguage) {
-                        return detectedLanguage;
-                    }
-                }
-                return this.config.defaultLanguage;
+                return this._currentLanguage;
             },
             set: function (language) {
                 var _a;
@@ -157,7 +145,8 @@
                     throw new Error("Setting invalid language value ".concat(language));
                 }
                 this._currentLanguage = language;
-                if (((_a = this.config) === null || _a === void 0 ? void 0 : _a.languageStore) && typeof localStorage !== 'undefined') {
+                if (((_a = this.config) === null || _a === void 0 ? void 0 : _a.enableLanguageStore) &&
+                    typeof localStorage !== 'undefined') {
                     localStorage.setItem(CURRENT_LANGUAGE_LOCAL_STORAGE_KEY, language);
                 }
             },
@@ -174,6 +163,21 @@
             enumerable: false,
             configurable: true
         });
+        Properties.prototype.getInitialLanguage = function () {
+            if (this.config.enableLanguageStore) {
+                var storedLanguage = this.getStoredLanguage();
+                if (storedLanguage) {
+                    return storedLanguage;
+                }
+            }
+            if (this.config.enableLanguageDetection) {
+                var detectedLanguage = this.getLanguageByNavigator();
+                if (detectedLanguage) {
+                    return detectedLanguage;
+                }
+            }
+            return this.config.defaultLanguage;
+        };
         Properties.prototype.getStoredLanguage = function () {
             if (typeof localStorage !== 'undefined') {
                 var storedLanguage = localStorage.getItem(CURRENT_LANGUAGE_LOCAL_STORAGE_KEY);
@@ -1650,11 +1654,11 @@
             /**
              * Store user language in localStorage (default: true)
              */
-            this.languageStore = true;
+            this.enableLanguageStore = true;
             /**
              * Use auto language detection by browser locale (default: true)
              */
-            this.languageDetect = true;
+            this.enableLanguageDetection = true;
             this.filesUrlPrefix = 'i18n/';
             this.tagAttributes = {
                 textarea: ['placeholder'],
@@ -1767,7 +1771,7 @@
             this.handshake = function () {
                 var sharedConfiguration = __assign(__assign({}, _this.properties), { config: __assign(__assign({}, _this.properties.config), { 
                         //remove properties, which cannot be sent by window.postMessage
-                        staticData: undefined, targetElement: undefined, _targetElement: undefined, ui: undefined }), uiPresent: Boolean(_this.properties.config.ui), uiVersion: "4.1.0" });
+                        staticData: undefined, targetElement: undefined, _targetElement: undefined, ui: undefined }), uiPresent: Boolean(_this.properties.config.ui), uiVersion: "4.2.1" });
                 var timer = null;
                 var ping = function () {
                     _this.messages.send('TOLGEE_READY', sharedConfiguration);