@flusys/ng-shared 5.0.4 → 5.1.1

package/fesm2022/flusys-ng-shared.mjs

@@ -2,7 +2,7 @@ import * as i0 from '@angular/core';
 import { inject, PLATFORM_ID, Injectable, DOCUMENT, REQUEST, signal, computed, ElementRef, input, effect, Directive, TemplateRef, ViewContainerRef, output, Pipe, Injector, isDevMode, NgModule, resource, model, runInInjectionContext, untracked, forwardRef, InjectionToken, Component, DestroyRef, ApplicationRef, viewChild, afterNextRender, ViewEncapsulation } from '@angular/core';
 import { isPlatformServer, isPlatformBrowser, CommonModule, NgOptimizedImage, NgComponentOutlet, DatePipe, DOCUMENT as DOCUMENT$1 } from '@angular/common';
 import { HttpClient, HttpContextToken, HttpHeaders, HttpParams } from '@angular/common/http';
-import { APP_CONFIG, getServiceUrl, LOCALIZATION_STATE_SERVICE, LOCALIZATION_API_SERVICE, FALLBACK_MESSAGES_REGISTRY } from '@flusys/ng-core';
+import { APP_CONFIG, getServiceUrl, LOCALIZATION_STATE_SERVICE, FALLBACK_MESSAGES_REGISTRY, LOCALIZATION_API_SERVICE } from '@flusys/ng-core';
 import { of, catchError as catchError$1, throwError, firstValueFrom, map as map$1, from } from 'rxjs';
 import { map, tap, catchError } from 'rxjs/operators';
 import * as i1$1 from '@angular/forms';
@@ -715,26 +715,30 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.1.5", ngImpor
         }] });
 
 class TranslateService {
-    localizationState = inject(LOCALIZATION_STATE_SERVICE);
+    localizationState = inject(LOCALIZATION_STATE_SERVICE, {
+        optional: true,
+    });
+    registry = inject(FALLBACK_MESSAGES_REGISTRY, {
+        optional: false,
+    });
     translate(key, params) {
+        if (this.localizationState === null) {
+            const value = this.registry[key];
+            return this.interpolate(value, params);
+        }
         const translations = this.localizationState.translations();
-        const value = translations[key];
+        let value = translations[key];
         if (!value) {
-            return this.getFromFallback(key, params);
+            const fallbacks = this.localizationState.fallbackMessages();
+            value = fallbacks[key] ?? key;
         }
         return this.interpolate(value, params);
     }
     translateSignal(key, params) {
         return computed(() => {
-            this.localizationState.currentLanguage();
             return this.translate(key, params);
         });
     }
-    getFromFallback(key, params) {
-        const fallbacks = this.localizationState.fallbackMessages();
-        const value = fallbacks[key] ?? key;
-        return this.interpolate(value, params);
-    }
     interpolate(template, params) {
         if (!params || !template)
             return template;
@@ -1206,11 +1210,7 @@ function resolveTranslationModule(config) {
         // Register fallback messages
         if (fallbackMessages) {
             if (locServices) {
-                modules.forEach((module) => {
-                    if (!locServices.stateService.hasModuleFallbacks(module)) {
-                        locServices.stateService.registerModuleFallbacks(module, fallbackMessages);
-                    }
-                });
+                locServices.stateService.updateFallbackMessages(fallbackMessages);
             }
             else {
                 const registry = injector.get(FALLBACK_MESSAGES_REGISTRY, null);