dev #49

Merged
JoeKung merged 12 commits from dev into main 2026-03-21 18:57:57 +01:00
3 changed files with 5 additions and 4 deletions
Showing only changes of commit 20988e425a - Show all commits

View File

@@ -60,7 +60,7 @@ export const appConfig: ApplicationConfig = {
),
importProvidersFrom(
TranslateModule.forRoot({
defaultLanguage: 'it',
fallbackLang: 'it',
loader: {
provide: TranslateLoader,
useClass: StaticTranslateLoader,
@@ -75,7 +75,7 @@ export const appConfig: ApplicationConfig = {
} | null;
translate.addLangs([...SUPPORTED_LANGS]);
translate.setDefaultLang('it');
translate.setFallbackLang('it');
const requestedUrl =
(typeof request?.url === 'string' && request.url) || router.url || '/';
const lang = resolveLangFromUrl(requestedUrl);

View File

@@ -9,7 +9,7 @@ describe('LanguageService', () => {
const translate = {
currentLang: '',
addLangs: jasmine.createSpy('addLangs'),
setDefaultLang: jasmine.createSpy('setDefaultLang'),
setFallbackLang: jasmine.createSpy('setFallbackLang'),
use: jasmine.createSpy('use').and.callFake((lang: string) => {
translate.currentLang = lang;
onLangChange.next({ lang });
@@ -75,6 +75,7 @@ describe('LanguageService', () => {
const service = new LanguageService(translate, router);
expect(translate.use).toHaveBeenCalledWith('it');
expect((translate as any).setFallbackLang).toHaveBeenCalledWith('it');
expect(navigateSpy).toHaveBeenCalledTimes(1);
const firstCall = navigateSpy.calls.mostRecent();

View File

@@ -24,7 +24,7 @@ export class LanguageService {
private router: Router,
) {
this.translate.addLangs(this.supportedLangs);
this.translate.setDefaultLang('it');
this.translate.setFallbackLang('it');
this.translate.onLangChange.subscribe((event) => {
const lang =
typeof event.lang === 'string' ? event.lang.toLowerCase() : null;