@stemy/ngx-utils 12.2.11 → 12.2.12

package/bundles/stemy-ngx-utils.umd.js

@@ -3848,8 +3848,8 @@
             get: function () {
                 var _this = this;
                 this.loadSettings().then(function (s) { return _this.languageSettings.next(s); });
-                return rxjs.combineLatest([this.languageSettings, this.events.languageChanged]).pipe(operators.map(function (_a) {
-                    var _b = __read(_a, 2), settings = _b[0], lang = _b[1];
+                return rxjs.combineLatest([this.languageSettings, this.events.languageChanged]).pipe(operators.map(function (_b) {
+                    var _c = __read(_b, 2), settings = _c[0], lang = _c[1];
                     return !settings ? {} : settings.settings[lang] || {};
                 }));
             },
@@ -3870,22 +3870,35 @@
         LanguageService.prototype.initFromSettings = function () {
             return __awaiter(this, void 0, void 0, function () {
                 var defaultLanguage, settings, devLanguages, lang;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                var _this = this;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
                         case 0:
                             defaultLanguage = this.defaultLanguage;
                             return [4 /*yield*/, this.loadSettings()];
                         case 1:
-                            settings = _a.sent();
+                            settings = _b.sent();
                             this.languageSettings.next(settings);
                             devLanguages = settings.devLanguages || [];
                             this.languageList = (settings.languages || []).filter(function (lang) {
+                                var _a;
+                                var unavailable = (_a = settings.settings[lang]) === null || _a === void 0 ? void 0 : _a.unavailable;
+                                if (unavailable) {
+                                    var parts = unavailable.split("/");
+                                    var value = parts[0] || parts[1];
+                                    var flags = parts.length > 1 ? parts[parts.length - 1] : "g";
+                                    if (new RegExp(value, flags).test(_this.config.baseDomain))
+                                        return false;
+                                }
                                 return devLanguages.indexOf(lang) < 0;
                             });
-                            lang = this.languages.indexOf(defaultLanguage) < 0 ? settings.defaultLanguage : defaultLanguage;
+                            if (this.languageList.length === 0) {
+                                this.languageList = [defaultLanguage];
+                            }
+                            lang = this.languages.indexOf(defaultLanguage) < 0 ? settings.defaultLanguage || this.languageList[0] : defaultLanguage;
                             return [4 /*yield*/, this.useLanguage(lang)];
                         case 2:
-                            _a.sent();
+                            _b.sent();
                             this.events.languageChanged.emit(lang);
                             return [2 /*return*/];
                     }
@@ -3896,24 +3909,24 @@
             if (params === void 0) { params = null; }
             return __awaiter(this, void 0, void 0, function () {
                 var lowerKey, dict, reason_1;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
                         case 0:
                             if (!key)
                                 return [2 /*return*/, ""];
-                            _a.label = 1;
+                            _b.label = 1;
                         case 1:
-                            _a.trys.push([1, 3, , 4]);
+                            _b.trys.push([1, 3, , 4]);
                             lowerKey = key.toLocaleLowerCase();
                             return [4 /*yield*/, this.loadDictionary()];
                         case 2:
-                            dict = _a.sent();
+                            dict = _b.sent();
                             if (lowerKey in dict) {
                                 return [2 /*return*/, this.interpolate(dict[lowerKey], params)];
                             }
                             return [2 /*return*/, this.interpolate(key, params)];
                         case 3:
-                            reason_1 = _a.sent();
+                            reason_1 = _b.sent();
                             console.log("ERROR IN TRANSLATIONS", reason_1);
                             return [2 /*return*/, key];
                         case 4: return [2 /*return*/];
@@ -3924,8 +3937,8 @@
         LanguageService.prototype.useLanguage = function (lang) {
             return __awaiter(this, void 0, void 0, function () {
                 var dict;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
                         case 0:
                             lang = this.languages.indexOf(lang) < 0 ? this.languages[0] : lang;
                             this.client.setExtraRequestParam("language", lang);
@@ -3935,7 +3948,7 @@
                             this.currentLang = lang;
                             return [4 /*yield*/, this.loadDictionary()];
                         case 1:
-                            dict = _a.sent();
+                            dict = _b.sent();
                             this.translations[lang] = dict;
                             return [2 /*return*/, dict];
                     }
@@ -3959,7 +3972,7 @@
             return this.translationRequests[lang];
         };
         LanguageService.prototype.loadSettings = function () {
-            this.settingsPromise = this.settingsPromise || this.client.get(this.config.translationUrl + "languageSettings").toPromise()
+            this.settingsPromise = this.settingsPromise || (this.client.get(this.config.translationUrl + "languageSettings").toPromise())
                 .then(function (settings) {
                 return settings;
             }, function () {
@@ -3970,7 +3983,7 @@
                     settings: {
                         de: {},
                         hu: {},
-                        end: {}
+                        en: {}
                     }
                 };
             });