fix(ngx-i18n): Add initializeLanguage

Author: IbenTesara

libs/i18n/src/lib/guards/i18n/i18n.guard.spec.ts

@@ -14,6 +14,7 @@ describe('NgxI18nGuard', () => {
 		currentLanguage: 'nl',
 		availableLanguages: ['nl', 'en'],
 		setCurrentLanguage: jasmine.createSpy(),
+		initializeLanguage: jasmine.createSpy(),
 	};
 
 	beforeEach(() => {

libs/i18n/src/lib/guards/i18n/i18n.guard.ts

@@ -16,8 +16,11 @@ export const NgxI18nGuard: CanActivateFn = (route: ActivatedRouteSnapshot): bool
 	const i18nService = inject(NgxI18nRootService);
 	const config: NgxI18nConfiguration = inject(NgxI18nConfigurationToken);
 
+	// Iben: Initialize the current language of the application
+	i18nService.initializeLanguage();
+
 	// Iben: Get the two language params
-	const currentLanguage = i18nService.currentLanguage || config.defaultLanguage;
+	const currentLanguage = i18nService.currentLanguage;
 	const routeLanguage = getLanguage(route, config);
 
 	// Iben: If both languages are the same, we can continue

libs/i18n/src/lib/guards/set-language/set-language.guard.ts

@@ -2,8 +2,6 @@ import { inject } from '@angular/core';
 import { CanActivateFn, Router } from '@angular/router';
 
 import { NgxI18nRootService } from '../../services';
-import { NgxI18nConfigurationToken } from '../../tokens';
-import { NgxI18nConfiguration } from '../../i18n.types';
 
 /**
  * Set the language in the url of the route
@@ -14,12 +12,9 @@ export const NgxI18nSetLanguageGuard: CanActivateFn = (): Promise<boolean> => {
 	// Iben: Fetch all injectables
 	const router: Router = inject(Router);
 	const i18nService = inject(NgxI18nRootService);
-	const config: NgxI18nConfiguration = inject(NgxI18nConfigurationToken);
 
-	// Iben: If no language was set already, we set the default language
-	if (!i18nService.currentLanguage) {
-		i18nService.setCurrentLanguage(config.defaultLanguage);
-	}
+	// Iben: Initialize the current language of the application
+	i18nService.initializeLanguage();
 
 	//Iben: Navigate to the set currentLanguage
 	return router.navigate(['/', i18nService.currentLanguage]);

libs/i18n/src/lib/services/root-i18n/root-i18n.service.ts

@@ -40,24 +40,56 @@ export class NgxI18nRootService {
 	 * @param language - The provided language
 	 */
 	public setCurrentLanguage(language: string): void {
-		// Iben: If a language is set that's not part of the available languages, we return a warn
+		// Iben: Save the new language
+		let newLanguage = language;
+
+		// Iben: Check if the new language is part of the available languages
 		if (!this.configuration.availableLanguages.includes(language)) {
+			// Iben: If a language is set that's not part of the available languages, we return a warn
 			console.warn(
 				`NgxI18n: A language, ${language}, was attempted to be set that was not part of the available languages (${this.configuration.availableLanguages.join(
 					', '
 				)})`
 			);
 
-			// Iben: Early exit
-			return;
+			// Iben: If there is already a language set, we early exit and keep the remaining language
+			if (this.currentLanguage) {
+				return;
+			}
+
+			// Iben: If no language exists, we use the default language
+			newLanguage = this.configuration.defaultLanguage;
 		}
 
 		// Iben: Save the current language to the localStorage when we're in the browser
 		if (isPlatformBrowser(this.platformId)) {
-			localStorage.setItem('ngx-language', language);
+			localStorage.setItem('ngx-i18n-language', newLanguage);
 		}
 
 		// Iben: Update the subject
-		this.currentLanguageSubject.next(language);
+		this.currentLanguageSubject.next(newLanguage);
+	}
+
+	/**
+	 * Sets the initial language of the application when no language is set yet.
+	 *
+	 * If a previous language was set in the local storage, said language is used. If not, the default language gets used.
+	 */
+	public initializeLanguage(): void {
+		// Iben: If the current language already exists, we early exit
+		if (this.currentLanguage) {
+			return;
+		}
+
+		// Iben: If the current language does not exist, we check if it exists in the local storage, if not, we use the default config
+		let language = this.configuration.defaultLanguage;
+
+		if (isPlatformBrowser(this.platformId)) {
+			language =
+				localStorage.getItem('ngx-i18n-language') || this.configuration.defaultLanguage;
+		}
+
+		// Iben: We set the new language
+		this.setCurrentLanguage(language);
 	}
 }