feat: i18nextService uses namespace "KoliBri" (#5610)

public-ui · Nov 27, 2023 · 1793d25 · 1793d25
2 parents 0fb50bf + 043d006
commit 1793d25
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/packages/components/src/core/i18n.ts b/packages/components/src/core/i18n.ts
@@ -32,10 +32,11 @@ export interface II18nService {
 
 export class I18nextService implements II18nService {
 	private static instance: II18nService;
+	private static namespace = 'KoliBri';
 
 	private constructor() {}
 
-	public static async getInstance(
+	public static async createInstance(
 		lng: Generic.I18n.Locale.ISO_639_1,
 		translations?:
 			| Generic.I18n.RegisterPatch<Generic.I18n.Locale.ISO_639_1, string, string>
@@ -50,9 +51,14 @@ export class I18nextService implements II18nService {
 
 		I18nextService.instance = new I18nextService();
 
-		await i18next.init({
-			lng,
-		});
+		if (!i18next.isInitialized) {
+			await i18next.init({
+				ns: [I18nextService.namespace],
+				lng,
+			});
+		} else {
+			await i18next.loadNamespaces(I18nextService.namespace);
+		}
 
 		if (translations !== undefined) {
 			translations.forEach((t) =>
@@ -67,7 +73,7 @@ export class I18nextService implements II18nService {
 	}
 
 	public static addResourceBundle(lng: Generic.I18n.Locale.ISO_639_1, translationMap: Generic.I18n.Map<string, string>) {
-		i18next.addResourceBundle(lng, 'translation', translationMap, true);
+		i18next.addResourceBundle(lng, I18nextService.namespace, translationMap, true);
 	}
 
 	public addResourceBundle(lng: Generic.I18n.Locale.ISO_639_1, translationMap: Generic.I18n.Map<string, string>) {
@@ -76,6 +82,7 @@ export class I18nextService implements II18nService {
 
 	public translate(key: string, options?: ITranslationOptions) {
 		return i18next.t(key, {
+			ns: I18nextService.namespace,
 			count: options?.count,
 			...options?.placeholders,
 		});

diff --git a/packages/components/src/core/index.ts b/packages/components/src/core/index.ts
@@ -12,7 +12,7 @@ export const register = async (
 	options?: RegisterOptions
 ): Promise<void[]> => {
 	if (STORE.I18n === undefined) {
-		const i18n = await I18nextService.getInstance(options?.translation?.name ?? 'de', options?.translations);
+		const i18n = await I18nextService.createInstance(options?.translation?.name ?? 'de', options?.translations);
 		Object.defineProperty(STORE, 'I18n', {
 			value: i18n,
 			writable: false,