inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2026-09-09 18:03:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ACS-11213] Reverted ngx translate upgrade (#11702)

Browse Source
This commit is contained in:
AleksanderSklorz
2026-02-27 23:42:44 +01:00
committed by GitHub
parent a15b1f4c85
commit 0b7b89e5d8
15 changed files with 66 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/core/src/lib/core.module.ts
+8 -3
View File
@@ -16,7 +16,7 @@
*/
import { NgModule, ModuleWithProviders } from '@angular/core';
import { provideTranslateService, provideTranslateLoader } from '@ngx-translate/core';
import { TranslateLoader, provideTranslateService } from '@ngx-translate/core';
import { ABOUT_DIRECTIVES } from './about/about.module';
import { CARD_VIEW_DIRECTIVES } from './card-view/card-view.module';
import { CONTEXT_MENU_DIRECTIVES } from './context-menu/context-menu.module';
@@ -38,6 +38,7 @@ import { CORE_DIRECTIVES } from './directives/directive.module';
import { CORE_PIPES } from './pipes/pipe.module';
import { TranslateLoaderService } from './translation/translate-loader.service';
import { SEARCH_TEXT_INPUT_DIRECTIVES } from './search-text/search-text-input.module';
import { HttpClient } from '@angular/common/http';
import { AppConfigPipe } from './app-config';
import { IconComponent } from './icon';
import { DynamicChipListComponent } from './dynamic-chip-list';
@@ -122,8 +123,12 @@ export class CoreModule {
ngModule: CoreModule,
providers: [
provideTranslateService({
loader: provideTranslateLoader(TranslateLoaderService),
fallbackLang: 'en'
loader: {
provide: TranslateLoader,
useClass: TranslateLoaderService,
deps: [HttpClient]
},
defaultLanguage: 'en'
}),
provideAppConfig()
]
lib/core/src/lib/testing/noop-translate.module.ts
+6 -7
View File
@@ -18,13 +18,13 @@
import { EventEmitter, Injectable, NgModule } from '@angular/core';
import { provideHttpClient } from '@angular/common/http';
import { provideHttpClientTesting } from '@angular/common/http/testing';
import { provideTranslateLoader, provideTranslateService, TranslateLoader, TranslationObject } from '@ngx-translate/core';
import { provideTranslateService, TranslateLoader } from '@ngx-translate/core';
import { TranslationService } from '../translation/translation.service';
import { LangChangeEvent } from '../mock';
import { Observable, of } from 'rxjs';
@Injectable({ providedIn: 'root' })
export class NoopTranslationService implements TranslateLoader {
export class NoopTranslationService {
defaultLang: string = 'en';
userLang: string;
customLoader: any;
@@ -47,10 +47,6 @@ export class NoopTranslationService implements TranslateLoader {
instant(key: string | Array<string>): string | any {
return key;
}
getTranslation(): Observable<TranslationObject> {
return of({});
}
}
@NgModule({
@@ -59,7 +55,10 @@ export class NoopTranslationService implements TranslateLoader {
provideHttpClientTesting(),
{ provide: TranslationService, useClass: NoopTranslationService },
provideTranslateService({
loader: provideTranslateLoader(NoopTranslationService)
loader: {
provide: TranslateLoader,
useClass: NoopTranslationService
}
})
]
})
lib/core/src/lib/translation/provide-i18n.spec.ts
+6 -6
View File
@@ -40,7 +40,7 @@ describe('provideI18N', () => {
it('should set default language to "en" when not specified', () => {
const translateService = TestBed.inject(TranslateService);
expect(translateService.getFallbackLang()).toBe('en');
expect(translateService.defaultLang).toBe('en');
});
});
@@ -53,7 +53,7 @@ describe('provideI18N', () => {
it('should set custom default language', () => {
const translateService = TestBed.inject(TranslateService);
expect(translateService.getFallbackLang()).toBe('fr');
expect(translateService.defaultLang).toBe('fr');
});
});
@@ -81,7 +81,7 @@ describe('provideI18N', () => {
// Services should be properly configured
expect(translateService).toBeDefined();
expect(translationService).toBeDefined();
expect(translateService.getFallbackLang()).toBe('en');
expect(translateService.defaultLang).toBe('en');
});
});
@@ -153,7 +153,7 @@ describe('provideI18N', () => {
it('should set translations for custom default language', () => {
const translateService = TestBed.inject(TranslateService);
expect(translateService.getFallbackLang()).toBe('fr');
expect(translateService.defaultLang).toBe('fr');
expect(translateService.instant('HELLO')).toBe('Bonjour!');
});
});
@@ -184,7 +184,7 @@ describe('provideI18N', () => {
const translateService = TestBed.inject(TranslateService);
const loader = translateService.currentLoader as TranslateLoaderService;
expect(translateService.getFallbackLang()).toBe('en');
expect(translateService.defaultLang).toBe('en');
expect(loader).toBeDefined();
expect(loader.providerRegistered).toBeDefined();
expect(loader.providerRegistered('adf-core')).toBeTruthy();
@@ -211,7 +211,7 @@ describe('provideI18N', () => {
it('should handle empty translations object', () => {
const translateService = TestBed.inject(TranslateService);
expect(translateService).toBeDefined();
expect(translateService.getFallbackLang()).toBe('en');
expect(translateService.defaultLang).toBe('en');
});
});
});
lib/core/src/lib/translation/provide-i18n.ts
+8 -3
View File
@@ -16,8 +16,9 @@
*/
import { EnvironmentProviders, inject, provideAppInitializer, Provider } from '@angular/core';
import { provideTranslateLoader, provideTranslateService, TranslateService } from '@ngx-translate/core';
import { provideTranslateService, TranslateLoader, TranslateService } from '@ngx-translate/core';
import { TranslateLoaderService } from './translate-loader.service';
import { HttpClient } from '@angular/common/http';
import { provideTranslations } from './translation.service';
export interface ProvideI18NConfig {
@@ -53,8 +54,12 @@ export function provideI18N(config?: ProvideI18NConfig): (Provider | Environment
const result: (Provider | EnvironmentProviders)[] = [
provideTranslateService({
loader: provideTranslateLoader(TranslateLoaderService),
fallbackLang: defaultLanguage
loader: {
provide: TranslateLoader,
useExisting: TranslateLoaderService,
deps: [HttpClient]
},
defaultLanguage
})
];
lib/core/src/lib/translation/translate-loader.spec.ts
+8 -3
View File
@@ -18,7 +18,8 @@
import { TestBed } from '@angular/core/testing';
import { TranslateLoaderService } from './translate-loader.service';
import { TranslationService } from './translation.service';
import { provideTranslateLoader, provideTranslateService } from '@ngx-translate/core';
import { provideTranslateService, TranslateLoader } from '@ngx-translate/core';
import { HttpClient } from '@angular/common/http';
describe('TranslateLoader', () => {
let translationService: TranslationService;
@@ -28,8 +29,12 @@ describe('TranslateLoader', () => {
TestBed.configureTestingModule({
providers: [
provideTranslateService({
loader: provideTranslateLoader(TranslateLoaderService),
fallbackLang: 'en'
loader: {
provide: TranslateLoader,
useClass: TranslateLoaderService,
deps: [HttpClient]
},
defaultLanguage: 'en'
}),
TranslationService
]
lib/core/src/lib/translation/translation.service.spec.ts
+9 -7
View File
@@ -16,7 +16,7 @@
*/
import { TestBed } from '@angular/core/testing';
import { provideTranslateLoader, provideTranslateService, TranslateLoader } from '@ngx-translate/core';
import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
import { TranslationService } from './translation.service';
import { of } from 'rxjs';
import { provideAppConfigTesting } from '../testing';
@@ -51,13 +51,15 @@ describe('TranslationService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
providers: [
TranslationService,
provideAppConfigTesting(),
provideTranslateService({
loader: provideTranslateLoader(FakeLoader)
imports: [
TranslateModule.forRoot({
loader: {
provide: TranslateLoader,
useClass: FakeLoader
}
})
]
],
providers: [TranslationService, provideAppConfigTesting()]
});
translationService = TestBed.inject(TranslationService);
lib/core/src/lib/translation/translation.service.ts
+6 -4
View File
@@ -62,7 +62,7 @@ export class TranslationService {
this.customLoader = this.translate.currentLoader as TranslateLoaderService;
this.defaultLang = 'en';
this.translate.setFallbackLang(this.defaultLang);
this.translate.setDefaultLang(this.defaultLang);
this.customLoader.setDefaultLang(this.defaultLang);
if (this.providers && this.providers.length > 0) {
@@ -115,7 +115,7 @@ export class TranslationService {
* @param fallback Language code to fall back to if the first one was unavailable
*/
loadTranslation(lang: string, fallback?: string) {
this.translate.currentLoader.getTranslation(lang).subscribe(
this.translate.getTranslation(lang).subscribe(
() => {
this.translate.use(lang);
this.onTranslationChanged(lang);
@@ -134,8 +134,10 @@ export class TranslationService {
* @param lang The new language code
*/
onTranslationChanged(lang: string): void {
const translations = this.customLoader.getFullTranslationJSON?.(lang) ?? {};
this.translate.setTranslation(lang, translations, true);
this.translate.onTranslationChange.next({
lang,
translations: this.customLoader.getFullTranslationJSON?.(lang) ?? {}
});
}
/**