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

package/lib/Properties.js

@@ -12,19 +12,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;

package/lib/Properties.js.map

@@ -1 +1 @@
-{"version":3,"file":"Properties.js","sourceRoot":"","sources":["../src/Properties.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Properties.js","sourceRoot":"","sources":["../src/Properties.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tolgee/core",
-  "version": "4.1.0",
+  "version": "4.1.2-rc.1085d75.0",
   "description": "Library providing ability to translate messages directly in context of developed application.",
   "main": "index.js",
   "module": "./dist/tolgee.esm.js",
@@ -61,7 +61,7 @@
     "typedoc-plugin-markdown": "3.11.14",
     "typescript": "4.6.2"
   },
-  "gitHead": "a593f31d12feb5c162f6100b92d9ad9850cccfcf",
+  "gitHead": "01de826d26c23c44ff79fef4960ce540ffede6ef",
   "publishConfig": {
     "access": "public"
   }