@quadrel-enterprise-ui/framework 20.0.2 → 20.0.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -29822,6 +29822,12 @@ class QdShellServiceNavigationService {
|
|
|
29822
29822
|
const languagesInOrder = this.swapCurrentLangToTheEndOfLanguageList(this.languageList);
|
|
29823
29823
|
const keysFromConfig = this.collectI18nKeysFromConfig(this.config);
|
|
29824
29824
|
const keys = Array.isArray(keysFromConfig) ? keysFromConfig : [];
|
|
29825
|
+
if (keys.length === 0) {
|
|
29826
|
+
languagesInOrder.forEach(lang => {
|
|
29827
|
+
this._translations[lang] = {};
|
|
29828
|
+
});
|
|
29829
|
+
return this.resolveDefaultLanguageAndMapAttributes$();
|
|
29830
|
+
}
|
|
29825
29831
|
const translationObservables = languagesInOrder.map(lang => {
|
|
29826
29832
|
this.translateService.use(lang);
|
|
29827
29833
|
return this.translateService.get(keys).pipe(map(trans => ({ lang, trans })));
|
|
@@ -29830,12 +29836,13 @@ class QdShellServiceNavigationService {
|
|
|
29830
29836
|
results.forEach(({ lang, trans }) => {
|
|
29831
29837
|
this._translations[lang] = typeof trans === 'object' && trans !== null ? trans : {};
|
|
29832
29838
|
});
|
|
29833
|
-
}), mergeMap(() =>
|
|
29834
|
-
|
|
29835
|
-
|
|
29836
|
-
|
|
29837
|
-
return
|
|
29838
|
-
}
|
|
29839
|
+
}), mergeMap(() => this.resolveDefaultLanguageAndMapAttributes$()));
|
|
29840
|
+
}
|
|
29841
|
+
resolveDefaultLanguageAndMapAttributes$() {
|
|
29842
|
+
if (this.config?.defaultLanguage != null) {
|
|
29843
|
+
return of(this.mapAttributes());
|
|
29844
|
+
}
|
|
29845
|
+
return this.eportalLanguageService.fetchEportalLanguage$().pipe(map(lang => lang?.toLowerCase()), map(lang => (this.languageList.includes(lang) ? lang : 'de')), map(lang => this.mapAttributes(lang)));
|
|
29839
29846
|
}
|
|
29840
29847
|
collectI18nKeysFromConfig(config) {
|
|
29841
29848
|
if (!config)
|
|
@@ -30157,6 +30164,12 @@ class QdShellHeaderWidgetService {
|
|
|
30157
30164
|
const languagesInOrder = this.swapCurrentLangToTheEndOfLanguageList(this.languageList);
|
|
30158
30165
|
const keysFromConfig = this.collectI18nKeysFromConfig(this._config);
|
|
30159
30166
|
const keys = Array.isArray(keysFromConfig) ? keysFromConfig : [];
|
|
30167
|
+
if (keys.length === 0) {
|
|
30168
|
+
languagesInOrder.forEach(lang => {
|
|
30169
|
+
this._translations[lang] = {};
|
|
30170
|
+
});
|
|
30171
|
+
return this.resolveDefaultLanguageAndMapAttributes$();
|
|
30172
|
+
}
|
|
30160
30173
|
const translationObservables = languagesInOrder.map((lang) => {
|
|
30161
30174
|
this.translateService.use(lang);
|
|
30162
30175
|
return this.translateService.get(keys).pipe(map(translations => ({ lang, translations })));
|
|
@@ -30165,12 +30178,13 @@ class QdShellHeaderWidgetService {
|
|
|
30165
30178
|
results.forEach(({ lang, translations }) => {
|
|
30166
30179
|
this._translations[lang] = typeof translations === 'object' && translations !== null ? translations : {};
|
|
30167
30180
|
});
|
|
30168
|
-
}), mergeMap(() =>
|
|
30169
|
-
|
|
30170
|
-
|
|
30171
|
-
|
|
30172
|
-
return
|
|
30173
|
-
}
|
|
30181
|
+
}), mergeMap(() => this.resolveDefaultLanguageAndMapAttributes$()));
|
|
30182
|
+
}
|
|
30183
|
+
resolveDefaultLanguageAndMapAttributes$() {
|
|
30184
|
+
if (this._config?.defaultLanguage != null) {
|
|
30185
|
+
return of(this.mapAttributes());
|
|
30186
|
+
}
|
|
30187
|
+
return this.eportalLanguageService.fetchEportalLanguage$().pipe(map(lang => lang?.toLowerCase()), map(lang => (this.languageList.includes(lang) ? lang : 'de')), map(lang => this.mapAttributes(lang)));
|
|
30174
30188
|
}
|
|
30175
30189
|
collectI18nKeysFromConfig(config) {
|
|
30176
30190
|
if (!config)
|