@stemy/ngx-utils 19.8.7 → 19.8.9

package/fesm2022/stemy-ngx-utils.mjs

@@ -4269,13 +4269,13 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.19", ngImpo
             type: Injectable
         }], ctorParameters: () => [{ type: LocalHttpService }] });
 
-const emptyDict = {};
+const EMPTY_DICT = {};
 class StaticLanguageService {
     get defaultLanguage() {
         return this.configs.getQueryParameter("lang") || this.storage.get("language", this.getDefaultLanguage());
     }
     get dictionary() {
-        return this.mergedTranslations[this.currentLanguage] || emptyDict;
+        return this.mergedTranslations[this.currentLanguage] || EMPTY_DICT;
     }
     set dictionary(value) {
         this.setDictionary(this.currentLang, value);
@@ -4345,7 +4345,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] || emptyDict;
+            this.translations[lang] = this.translations[lang] || EMPTY_DICT;
         });
     }
     addLanguages(languages) {
@@ -4414,7 +4414,8 @@ class StaticLanguageService {
     }
     interpolate(expr, params) {
         if (typeof expr === "string") {
-            return this.interpolateString(expr, params);
+            // Force single spaces to be empty strings, for labeling in forms.
+            return expr === " " ? "" : this.interpolateString(expr, params);
         }
         if (typeof expr === "function") {
             return expr(params);
@@ -4451,8 +4452,8 @@ class StaticLanguageService {
         ]);
         this.mergedTranslations = Array.from(languages).reduce((merged, language) => {
             merged[language] = {
-                ...(this.translations[language] || emptyDict),
-                ...(this.overrideTranslations[language] || emptyDict),
+                ...(this.translations[language] || EMPTY_DICT),
+                ...(this.overrideTranslations[language] || EMPTY_DICT),
             };
             return merged;
         }, {});
@@ -4500,7 +4501,7 @@ class LanguageService extends StaticLanguageService {
     }
     initService() {
         super.initService();
-        this.client.setParam("language", "de");
+        this.client.setParam("language", "en");
         this.translationRequests = {};
         this.languageSettings = new BehaviorSubject(null);
         if (this.universal.isServer)
@@ -4528,12 +4529,20 @@ class LanguageService extends StaticLanguageService {
         if (this.languageList.length === 0) {
             this.languageList = [defaultLanguage];
         }
-        const lang = this.languages.indexOf(defaultLanguage) < 0 ? settings.defaultLanguage || this.languageList[0] : defaultLanguage;
+        const lang = this.selectLanguage(this.currentLang)
+            ?? this.selectLanguage(defaultLanguage)
+            ?? this.selectLanguage(settings.defaultLanguage || this.languageList[0]);
         await this.useLanguage(lang);
         this.events.languageChanged.next(lang);
     }
+    selectLanguage(lang) {
+        if (!lang)
+            return null;
+        return this.languageList.length === 0 || this.languageList.includes(lang)
+            ? lang : null;
+    }
     async useLanguage(lang) {
-        lang = this.languages.indexOf(lang) < 0 ? this.languages[0] : lang;
+        lang = this.selectLanguage(lang);
         this.client.setParam("language", lang);
         if (lang === this.currentLang)
             return this.dictionary;
@@ -4541,8 +4550,9 @@ class LanguageService extends StaticLanguageService {
         this.currentLang = lang;
         return this.loadDictionary();
     }
-    getDictionary(lang) {
-        lang = this.languages.includes(lang) ? lang : this.currentLanguage;
+    async getDictionary(lang) {
+        if (!lang)
+            return EMPTY_DICT;
         const ext = this.config.translationExt || ``;
         this.translationRequests[lang] = this.translationRequests[lang] || firstValueFrom(this.client.get(`${this.config.translationUrl}${lang}${ext}`))
             .then(response => {
@@ -4556,7 +4566,7 @@ class LanguageService extends StaticLanguageService {
             return dictionary;
         }).catch(error => {
             console.warn("Translation dictionary problem:", error);
-            return {};
+            return EMPTY_DICT;
         });
         return this.translationRequests[lang];
     }
@@ -8259,7 +8269,6 @@ class InteractiveItemComponent {
     set rotation(value) {
         if (isNaN(value))
             return;
-        console.log("set rotation", this.rotation, value);
         this.rot = value;
         this.validRotation = this.rot;
     }
@@ -8363,7 +8372,6 @@ class InteractiveItemComponent {
         this.rot = isNaN(value) ? this.rot : value;
         this.calcShapes();
         this.validRot = this.checkIsValid() ? this.rot : this.validRot;
-        console.log("rotateTo", this.rot, this.validRot);
     }
     rotateEnd() {
         this.mDistances.clear();