@tolgee/core 4.0.0 → 4.1.0

package/dist/tolgee.umd.js

@@ -130,40 +130,36 @@
         }
         Object.defineProperty(Properties.prototype, "currentLanguage", {
             get: function () {
-                var result;
-                if (this.config.forceLanguage) {
+                var _a;
+                if ((_a = this.config) === null || _a === void 0 ? void 0 : _a.forceLanguage) {
                     return this.config.forceLanguage;
                 }
-                if (typeof localStorage !== 'undefined') {
-                    var storedLanguage = localStorage.getItem(CURRENT_LANGUAGE_LOCAL_STORAGE_KEY);
+                if (this._currentLanguage) {
+                    return this._currentLanguage;
+                }
+                if (this.config.languageStore) {
+                    var storedLanguage = this.getStoredLanguage();
                     if (storedLanguage) {
-                        result = storedLanguage;
-                    }
-                    if (this.config.availableLanguages) {
-                        var isSavedLanguageAvailable = this.config.availableLanguages.indexOf(result) > -1;
-                        if (!isSavedLanguageAvailable) {
-                            result = undefined;
-                        }
+                        return storedLanguage;
                     }
                 }
-                else {
-                    result = this._currentLanguage;
-                }
-                if (!result) {
-                    result = this.getLanguageByNavigator();
-                    this.currentLanguage = result;
+                if (this.config.languageDetect) {
+                    var detectedLanguage = this.getLanguageByNavigator();
+                    if (detectedLanguage) {
+                        return detectedLanguage;
+                    }
                 }
-                return result;
+                return this.config.defaultLanguage;
             },
             set: function (language) {
+                var _a;
                 if (!language) {
                     throw new Error("Setting invalid language value ".concat(language));
                 }
-                if (typeof localStorage === 'undefined') {
-                    this._currentLanguage = language;
-                    return;
+                this._currentLanguage = language;
+                if (((_a = this.config) === null || _a === void 0 ? void 0 : _a.languageStore) && typeof localStorage !== 'undefined') {
+                    localStorage.setItem(CURRENT_LANGUAGE_LOCAL_STORAGE_KEY, language);
                 }
-                localStorage.setItem(CURRENT_LANGUAGE_LOCAL_STORAGE_KEY, language);
             },
             enumerable: false,
             configurable: true
@@ -178,6 +174,18 @@
             enumerable: false,
             configurable: true
         });
+        Properties.prototype.getStoredLanguage = function () {
+            if (typeof localStorage !== 'undefined') {
+                var storedLanguage = localStorage.getItem(CURRENT_LANGUAGE_LOCAL_STORAGE_KEY);
+                if (!this.config.availableLanguages) {
+                    return storedLanguage;
+                }
+                var isSavedLanguageAvailable = this.config.availableLanguages.indexOf(storedLanguage) > -1;
+                if (isSavedLanguageAvailable) {
+                    return storedLanguage;
+                }
+            }
+        };
         Properties.prototype.getLanguageByNavigator = function () {
             if (typeof window !== 'undefined' && this.config.availableLanguages) {
                 var preferred_1 = window.navigator.language;
@@ -192,7 +200,6 @@
                     return twoLetterMatch;
                 }
             }
-            return this.config.defaultLanguage;
         };
         return Properties;
     }());
@@ -1636,7 +1643,18 @@
         function TolgeeConfig(config) {
             this.inputPrefix = '%-%tolgee:';
             this.inputSuffix = '%-%';
+            /**
+             * Used when auto detection is not available or is turned off
+             */
             this.defaultLanguage = 'en';
+            /**
+             * Store user language in localStorage (default: true)
+             */
+            this.languageStore = true;
+            /**
+             * Use auto language detection by browser locale (default: true)
+             */
+            this.languageDetect = true;
             this.filesUrlPrefix = 'i18n/';
             this.tagAttributes = {
                 textarea: ['placeholder'],
@@ -1749,7 +1767,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.0.0" });
+                        staticData: undefined, targetElement: undefined, _targetElement: undefined, ui: undefined }), uiPresent: Boolean(_this.properties.config.ui), uiVersion: "4.1.0" });
                 var timer = null;
                 var ping = function () {
                     _this.messages.send('TOLGEE_READY', sharedConfiguration);