@tolgee/core 4.1.0 → 4.1.2-rc.1085d75.0

package/dist/tolgee.cjs.js

@@ -135,19 +135,24 @@ var Properties = /** @class */ (function () {
             if (this._currentLanguage) {
                 return this._currentLanguage;
             }
+            var result;
             if (this.config.languageStore) {
                 var storedLanguage = this.getStoredLanguage();
                 if (storedLanguage) {
-                    return storedLanguage;
+                    result = storedLanguage;
                 }
             }
-            if (this.config.languageDetect) {
+            if (this.config.languageDetect && !result) {
                 var detectedLanguage = this.getLanguageByNavigator();
                 if (detectedLanguage) {
-                    return detectedLanguage;
+                    result = detectedLanguage;
                 }
             }
-            return this.config.defaultLanguage;
+            if (!result) {
+                result = this.config.defaultLanguage;
+            }
+            this._currentLanguage = result;
+            return result;
         },
         set: function (language) {
             var _a;
@@ -1765,7 +1770,7 @@ var PluginManager = /** @class */ (function () {
         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.1.2-rc.1085d75.0" });
             var timer = null;
             var ping = function () {
                 _this.messages.send('TOLGEE_READY', sharedConfiguration);