@stemy/ngx-utils 19.5.2 → 19.5.3

package/fesm2022/stemy-ngx-utils.mjs

@@ -3472,6 +3472,7 @@ class EventsService {
         this.eventForwarded = new EventEmitter();
         this.stickyUpdated = new EventEmitter();
         this.languageChanged = new EventEmitter();
+        this.translationsEnabled = new EventEmitter();
         this.sticky = false;
     }
     event(e) {
@@ -3598,7 +3599,7 @@ class StaticLanguageService {
         return this.translations[this.currentLanguage] || {};
     }
     set dictionary(value) {
-        this.translations[this.currentLanguage] = value;
+        this.setDictionary(this.currentLang, value);
     }
     get languages() {
         return this.languageList;
@@ -3616,12 +3617,18 @@ class StaticLanguageService {
     set editLanguage(lang) {
         this.editLang = lang || this.currentLanguage;
     }
+    get enableTranslations() {
+        return this.enableTrans;
+    }
+    set enableTranslations(value) {
+        this.enableTrans = value;
+        this.events.translationsEnabled.emit(value);
+    }
     get disableTranslations() {
-        return this.disableTrans;
+        return !this.enableTranslations;
     }
     set disableTranslations(value) {
-        this.disableTrans = value;
-        this.events.languageChanged.emit(this.currentLang);
+        this.enableTranslations = !value;
     }
     get httpClient() {
         return this.client;
@@ -3640,7 +3647,7 @@ class StaticLanguageService {
         this.client = client;
         this.editLang = null;
         this.currentLang = null;
-        this.disableTrans = false;
+        this.enableTrans = true;
         this.languageList = [];
         this.translations = {
             none: {}
@@ -3662,16 +3669,24 @@ class StaticLanguageService {
         this.replaceLanguages(this.languageList.concat(languages));
     }
     getTranslationSync(key, params = null) {
-        const lowerKey = (key || "").toLocaleLowerCase();
-        const translation = this.dictionary[lowerKey] || lowerKey;
-        return this.interpolate(translation == lowerKey ? key : translation, params);
-    }
-    getTranslation(key, params) {
-        if (!ObjectUtils.isString(key) || !key.length) {
-            throw new Error(`Parameter "key" required`);
+        if (!key)
+            return "";
+        try {
+            const lowerKey = key.toLocaleLowerCase();
+            const dict = this.dictionary;
+            if (lowerKey in dict && this.enableTranslations) {
+                return this.interpolate(dict[lowerKey], params);
+            }
+            return this.interpolate(key, params);
         }
-        const translation = ObjectUtils.getValue(this.dictionary, key, key) || key;
-        return this.promises.resolve(this.interpolate(translation, params));
+        catch (reason) {
+            console.warn("ERROR IN TRANSLATIONS", reason);
+            return key;
+        }
+    }
+    async getTranslation(key, params = null) {
+        await this.loadDictionary();
+        return this.getTranslationSync(key, params);
     }
     getTranslations(...keys) {
         return this.promises.create(resolve => {
@@ -3692,6 +3707,16 @@ class StaticLanguageService {
         const translation = translations ? translations.find(t => t.lang == lang) : null;
         return this.interpolate(translation ? translation.translation : "", params);
     }
+    async loadDictionary() {
+        return this.dictionary;
+    }
+    setDictionary(lang, dictionary) {
+        this.translations[lang] = Object.keys(dictionary || {}).reduce((res, key) => {
+            res[key.toLocaleLowerCase()] = dictionary[key];
+            return res;
+        }, {});
+        return this.translations[lang];
+    }
     interpolate(expr, params) {
         if (typeof expr === "string") {
             return this.interpolateString(expr, params);
@@ -3766,6 +3791,7 @@ class LanguageService extends StaticLanguageService {
         }));
     }
     initService() {
+        super.initService();
         this.client.setExtraRequestParam("language", "de");
         this.translationRequests = {};
         this.languageSettings = new BehaviorSubject(null);
@@ -3798,22 +3824,6 @@ class LanguageService extends StaticLanguageService {
         await this.useLanguage(lang);
         this.events.languageChanged.emit(lang);
     }
-    async getTranslation(key, params = null) {
-        if (!key)
-            return "";
-        try {
-            const lowerKey = key.toLocaleLowerCase();
-            const dict = await this.loadDictionary();
-            if (lowerKey in dict) {
-                return this.interpolate(dict[lowerKey], params);
-            }
-            return this.interpolate(key, params);
-        }
-        catch (reason) {
-            console.log("ERROR IN TRANSLATIONS", reason);
-            return key;
-        }
-    }
     async useLanguage(lang) {
         lang = this.languages.indexOf(lang) < 0 ? this.languages[0] : lang;
         this.client.setExtraRequestParam("language", lang);
@@ -3821,22 +3831,18 @@ class LanguageService extends StaticLanguageService {
             return this.dictionary;
         this.storage.set("language", lang);
         this.currentLang = lang;
-        const dict = await this.loadDictionary();
-        this.translations[lang] = dict;
-        return dict;
+        return this.loadDictionary();
     }
     loadDictionary() {
         const lang = this.currentLanguage;
         this.translationRequests[lang] = this.translationRequests[lang] || new Promise(resolve => {
             const ext = this.config.translationExt || ``;
-            this.httpClient.get(`${this.config.translationUrl}${lang}${ext}`).toPromise().then(response => {
-                response = response || {};
-                resolve(Object.keys(response).reduce((result, key) => {
-                    result[key.toLocaleLowerCase()] = response[key];
-                    return result;
-                }, {}));
-            }, () => {
-                resolve({});
+            const request = this.httpClient.get(`${this.config.translationUrl}${lang}${ext}`);
+            firstValueFrom(request).then(response => {
+                resolve(this.setDictionary(lang, response));
+            }, reason => {
+                console.warn("ERROR IN TRANSLATIONS", reason);
+                resolve(this.setDictionary(lang, {}));
             });
         });
         return this.translationRequests[lang];
@@ -5172,9 +5178,9 @@ class TranslatePipe {
             this.lang = lang;
             dirty = true;
         }
-        const disabled = this.language.disableTranslations;
-        if (this.disabled !== disabled) {
-            this.disabled = disabled;
+        const enabled = this.language.enableTranslations;
+        if (this.enabled !== enabled) {
+            this.enabled = enabled;
             dirty = true;
         }
         if (!ObjectUtils.equals(this.query, query)) {
@@ -5207,10 +5213,6 @@ class TranslatePipe {
                 this.lastValue = Array.isArray(query) ? this.language.getTranslationFromArray(query, this.params, lang) : this.language.getTranslationFromObject(query, this.params, lang);
                 return this.lastValue;
             }
-            if (this.disabled) {
-                this.lastValue = query;
-                return this.lastValue;
-            }
             this.lastValue = this.language.getTranslationSync(query, this.params);
             this.language.getTranslation(query, this.params).then(value => {
                 this.lastValue = value;