@stemy/ngx-utils 19.7.25 → 19.7.27

package/fesm2022/stemy-ngx-utils.mjs

@@ -3076,6 +3076,7 @@ class EventsService {
         this.eventForwarded = new Subject();
         this.stickyUpdated = new Subject();
         this.languageChanged = new Subject();
+        this.editLanguageChanged = new Subject();
         this.translationsEnabled = new Subject();
         this.userChanged = new Subject();
         this.sticky = false;
@@ -4189,15 +4190,17 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.14", ngImpo
             type: Injectable
         }], ctorParameters: () => [{ type: LocalHttpService }] });
 
+const emptyDict = {};
 class StaticLanguageService {
     get defaultLanguage() {
         return this.configs.getQueryParameter("lang") || this.storage.get("language", this.getDefaultLanguage());
     }
     get dictionary() {
-        return this.translations[this.currentLanguage] || {};
+        return this.mergedTranslations[this.currentLanguage] || emptyDict;
     }
     set dictionary(value) {
         this.setDictionary(this.currentLang, value);
+        this.mergeTranslations();
     }
     get languages() {
         return this.languageList;
@@ -4214,6 +4217,7 @@ class StaticLanguageService {
     }
     set editLanguage(lang) {
         this.editLang = lang || this.currentLanguage;
+        this.events.editLanguageChanged.next(this.editLang);
     }
     get enableTranslations() {
         return this.enableTrans;
@@ -4250,6 +4254,10 @@ class StaticLanguageService {
         this.translations = {
             none: {}
         };
+        this.overrideTranslations = {
+            none: {}
+        };
+        this.mergedTranslations = this.translations;
         this.initService();
     }
     initService() {
@@ -4258,7 +4266,7 @@ class StaticLanguageService {
         languages = Array.isArray(languages) && languages.length > 0 ? languages : this.languageList;
         this.languageList = Array.from(new Set(languages));
         this.languageList.forEach(lang => {
-            this.translations[lang] = this.translations[lang] || {};
+            this.translations[lang] = this.translations[lang] || emptyDict;
         });
     }
     addLanguages(languages) {
@@ -4266,6 +4274,15 @@ class StaticLanguageService {
             return;
         this.replaceLanguages(this.languageList.concat(languages));
     }
+    setOverrideTranslations(translations) {
+        if (ObjectUtils.isObject(translations)) {
+            this.overrideTranslations = translations;
+            this.mergeTranslations();
+            return;
+        }
+        this.overrideTranslations = {};
+        this.mergedTranslations = this.translations;
+    }
     getTranslationSync(key, params = null) {
         key = `${key ?? ""}`;
         if (!key)
@@ -4348,6 +4365,19 @@ class StaticLanguageService {
         });
         return browserLang;
     }
+    mergeTranslations() {
+        const languages = new Set([
+            ...Object.keys(this.translations),
+            ...Object.keys(this.overrideTranslations)
+        ]);
+        this.mergedTranslations = Array.from(languages).reduce((merged, language) => {
+            merged[language] = {
+                ...(this.translations[language] || emptyDict),
+                ...(this.overrideTranslations[language] || emptyDict),
+            };
+            return merged;
+        }, {});
+    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.14", ngImport: i0, type: StaticLanguageService, deps: [{ token: EventsService }, { token: StorageService }, { token: CONFIG_SERVICE }, { token: PROMISE_SERVICE }, { token: BaseHttpClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.14", ngImport: i0, type: StaticLanguageService }); }
 }
@@ -4432,26 +4462,33 @@ class LanguageService extends StaticLanguageService {
         this.currentLang = lang;
         return this.loadDictionary();
     }
-    loadDictionary() {
-        const lang = this.currentLanguage;
-        this.translationRequests[lang] = this.translationRequests[lang] || new Promise(resolve => {
-            const ext = this.config.translationExt || ``;
-            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, {}));
-            });
+    getDictionary(lang) {
+        lang = this.languages.includes(lang) ? lang : this.currentLanguage;
+        const ext = this.config.translationExt || ``;
+        this.translationRequests[lang] = this.translationRequests[lang] || firstValueFrom(this.client.get(`${this.config.translationUrl}${lang}${ext}`))
+            .then(response => {
+            response = response || {};
+            const dictionary = Object.keys(response).reduce((result, key) => {
+                result[key.toLocaleLowerCase()] = response[key];
+                return result;
+            }, {});
+            this.translations[lang] = dictionary;
+            this.mergeTranslations();
+            return dictionary;
+        }).catch(error => {
+            console.warn("Translation dictionary problem:", error);
+            return {};
         });
         return this.translationRequests[lang];
     }
+    async loadDictionary() {
+        return this.getDictionary(this.currentLang);
+    }
     loadSettings() {
         const ext = this.config.translationExt || ``;
-        this.settingsPromise = this.settingsPromise || (this.client.get(`${this.config.translationUrl}languageSettings${ext}`).toPromise())
-            .then((settings) => {
-            return settings;
-        }, () => {
+        this.settingsPromise = this.settingsPromise || firstValueFrom(this.client.get(`${this.config.translationUrl}languageSettings${ext}`))
+            .catch(error => {
+            console.warn("Translation settings problem:", error);
             return {
                 languages: ["de", "en", "hu"],
                 devLanguages: [],
@@ -5843,9 +5880,9 @@ class TranslatePipe {
         if (!query)
             return "";
         let dirty = false;
-        const lang = this.currentLang;
-        if (this.lang !== lang) {
-            this.lang = lang;
+        const dictionary = this.language.dictionary;
+        if (this.dictionary !== dictionary) {
+            this.dictionary = dictionary;
             dirty = true;
         }
         const enabled = this.language.enableTranslations;
@@ -5880,7 +5917,9 @@ class TranslatePipe {
         }
         if (dirty) {
             if (typeof query === "object") {
-                this.lastValue = Array.isArray(query) ? this.language.getTranslationFromArray(query, this.params, lang) : this.language.getTranslationFromObject(query, this.params, lang);
+                this.lastValue = Array.isArray(query)
+                    ? this.language.getTranslationFromArray(query, this.params)
+                    : this.language.getTranslationFromObject(query, this.params);
                 return this.lastValue;
             }
             this.lastValue = this.language.getTranslationSync(query, this.params);
@@ -7320,10 +7359,10 @@ class ChipsComponent {
             }
             return false;
         }
-        if (ev.key == "Enter") {
+        if (ev.key === "Enter" || ev.key === "Tab") {
             return this.enterOption(input.value);
         }
-        if (ev.key == "Backspace" && !input.value && !changed && this.valueOptions.length > 0) {
+        if (ev.key === "Backspace" && !input.value && !changed && this.valueOptions.length > 0) {
             this.makeUndo();
             this.updateValues(this.valueOptions.slice(0, this.valueOptions.length - 1));
             this.onTouched(this.value);