From ef258443a227d3a917f19c345981ddcfab3dc9ef Mon Sep 17 00:00:00 2001 From: erdemcaygor Date: Thu, 29 Jan 2026 15:22:46 +0300 Subject: [PATCH] refactoring --- .../abp-application-configuration.service.ts | 4 ++-- .../core/src/lib/services/localization.service.ts | 2 +- .../src/lib/services/ui-localization.service.ts | 13 ++++++------- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/npm/ng-packs/packages/core/src/lib/proxy/volo/abp/asp-net-core/mvc/application-configurations/abp-application-configuration.service.ts b/npm/ng-packs/packages/core/src/lib/proxy/volo/abp/asp-net-core/mvc/application-configurations/abp-application-configuration.service.ts index 9dc35fa7b6..4e1b115b7c 100644 --- a/npm/ng-packs/packages/core/src/lib/proxy/volo/abp/asp-net-core/mvc/application-configurations/abp-application-configuration.service.ts +++ b/npm/ng-packs/packages/core/src/lib/proxy/volo/abp/asp-net-core/mvc/application-configurations/abp-application-configuration.service.ts @@ -6,8 +6,8 @@ import { Injectable, inject } from '@angular/core'; @Injectable({ providedIn: 'root', }) -export class AbpApplicationConfigurationService { - private restService = inject(RestService); +export class AbpApplicationConfigurationService { + private restService = inject(RestService); apiName = 'abp'; diff --git a/npm/ng-packs/packages/core/src/lib/services/localization.service.ts b/npm/ng-packs/packages/core/src/lib/services/localization.service.ts index b954236f1a..0e27973a90 100644 --- a/npm/ng-packs/packages/core/src/lib/services/localization.service.ts +++ b/npm/ng-packs/packages/core/src/lib/services/localization.service.ts @@ -92,7 +92,7 @@ export class LocalizationService { const resourceName = entry[0]; const remoteTexts = entry[1]; let resource = local?.get(resourceName) || {}; - // UI > Backend priority: UI localizations override the backend localizations + // UI > Backend priority: local texts override remote texts resource = { ...remoteTexts, ...resource }; local?.set(resourceName, resource); diff --git a/npm/ng-packs/packages/core/src/lib/services/ui-localization.service.ts b/npm/ng-packs/packages/core/src/lib/services/ui-localization.service.ts index d6af88b587..3bbbfa71aa 100644 --- a/npm/ng-packs/packages/core/src/lib/services/ui-localization.service.ts +++ b/npm/ng-packs/packages/core/src/lib/services/ui-localization.service.ts @@ -7,7 +7,7 @@ import { LocalizationService } from './localization.service'; import { SessionStateService } from './session-state.service'; import { CORE_OPTIONS } from '../tokens/options.token'; -export interface LocalizationResource { +export interface UILocalizationResource { [resourceName: string]: Record; } @@ -23,7 +23,7 @@ export class UILocalizationService { private sessionState = inject(SessionStateService); private options = inject(CORE_OPTIONS); - private loadedLocalizations$ = new BehaviorSubject>({}); + private loadedLocalizations$ = new BehaviorSubject>({}); private currentLanguage$ = this.sessionState.getLanguage$(); @@ -38,8 +38,7 @@ export class UILocalizationService { this.currentLanguage$ .pipe( distinctUntilChanged(), - switchMap(culture => this.loadLocalizationFile(culture)), - shareReplay(1), + switchMap(culture => this.loadLocalizationFile(culture)) ) .subscribe(); } @@ -51,7 +50,7 @@ export class UILocalizationService { const basePath = config.basePath || '/assets/localization'; const url = `${basePath}/${culture}.json`; - return this.http.get(url).pipe( + return this.http.get(url).pipe( catchError(() => { // If file not found or error occurs, return null return of(null); @@ -64,7 +63,7 @@ export class UILocalizationService { ); } - private processLocalizationData(culture: string, data: LocalizationResource) { + private processLocalizationData(culture: string, data: UILocalizationResource) { const abpFormat: ABP.Localization[] = [ { culture, @@ -113,7 +112,7 @@ export class UILocalizationService { this.loadedLocalizations$.next(current); } - getLoadedLocalizations(culture?: string): LocalizationResource { + getLoadedLocalizations(culture?: string): UILocalizationResource { const lang = culture || this.sessionState.getLanguage(); return this.loadedLocalizations$.value[lang] || {}; }