Sync-in · Sovereign platform for file storage, sharing, synchronization, and collaboration.
TypeScript cloud-alternativecollaborationcollaborative-editingdropboxfile-serverfile-sharingfile-storagefile-syncfull-text-searchhomelabnextcloudon-premiseopen-sourceprivacy-firstprivate-cloudrealtimesecureself-hostedstorage-serverwebdav
feat(frontend:i18n): add dynamic translation loading and missing translation handler
johaven9f9baab9ae2c
diff --git a/frontend/src/app/app.config.ts b/frontend/src/app/app.config.tsindex 90417394..a341c7a1 100644--- a/frontend/src/app/app.config.ts+++ b/frontend/src/app/app.config.ts@@ -6,7 +6,7 @@import { HashLocationStrategy, LocationStrategy } from '@angular/common'import { HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi, withXsrfConfiguration } from '@angular/common/http'-import { ApplicationConfig, importProvidersFrom, provideZoneChangeDetection } from '@angular/core'+import { ApplicationConfig, importProvidersFrom, isDevMode, provideZoneChangeDetection } from '@angular/core'import { provideAnimations } from '@angular/platform-browser/animations'import { provideRouter } from '@angular/router'import { CSRF_KEY } from '@sync-in-server/backend/src/authentication/constants/auth'@@ -15,7 +15,7 @@ import { BsModalService } from 'ngx-bootstrap/modal'import { TooltipConfig } from 'ngx-bootstrap/tooltip'import { SocketIoModule } from 'ngx-socket-io'import { provideToastr } from 'ngx-toastr'-import { l10nConfig, TranslationStorage } from '../i18n/l10n'+import { l10nConfig, TranslationLoader, TranslationMissing, TranslationStorage } from '../i18n/l10n'import { routes } from './app.routes'import { AuthInterceptor } from './auth/auth.interceptor'import { getToolTipConfig } from './layout/layout.tooltip.config'@@ -28,7 +28,11 @@ export const appConfig: ApplicationConfig = {{ provide: HTTP_INTERCEPTORS, useClass: AuthInterceptor, multi: true },provideRouter(routes),provideHttpClient(withInterceptorsFromDi(), withXsrfConfiguration({ cookieName: CSRF_KEY, headerName: CSRF_KEY })),- provideL10nTranslation(l10nConfig, { storage: TranslationStorage }),+ provideL10nTranslation(l10nConfig, {+ storage: TranslationStorage,+ translationLoader: TranslationLoader,+ ...(isDevMode() ? { missingTranslationHandler: TranslationMissing } : {})+ }),provideL10nIntl(),provideAnimations(),provideToastr({ positionClass: 'toast-bottom-right', preventDuplicates: false, timeOut: 7000 }),diff --git a/frontend/src/app/layout/layout.service.ts b/frontend/src/app/layout/layout.service.tsindex d456893b..f83c3386 100644--- a/frontend/src/app/layout/layout.service.ts+++ b/frontend/src/app/layout/layout.service.ts@@ -15,7 +15,7 @@ import { BsModalRef, BsModalService, ModalOptions } from 'ngx-bootstrap/modal'import { ActiveToast, ToastrService } from 'ngx-toastr'import { BehaviorSubject, fromEvent, mergeWith, Observable, Subject } from 'rxjs'import { map } from 'rxjs/operators'-import { i18nAsset } from '../../i18n/l10n'+import { i18nLanguageText } from '../../i18n/l10n'import { APP_NAME } from '../app.constants'import { USER_LANGUAGE_AUTO } from '../applications/users/user.constants'import { getTheme } from '../common/utils/functions'@@ -237,10 +237,10 @@ export class LayoutService {}getLanguages(withAutoOption = false): string[] {- const languages: string[] = Object.keys(i18nAsset)- if (withAutoOption) {+ const languages: string[] = Object.keys(i18nLanguageText)+ if (!withAutoOption) {// auto if no language defined by user- languages.unshift(USER_LANGUAGE_AUTO)+ return languages.filter((l: string) => l !== USER_LANGUAGE_AUTO)}return languages}diff --git a/frontend/src/i18n/l10n.ts b/frontend/src/i18n/l10n.tsindex f5f95275..b29431e8 100755--- a/frontend/src/i18n/l10n.ts+++ b/frontend/src/i18n/l10n.ts@@ -5,18 +5,18 @@*/import { Injectable } from '@angular/core'-import { L10nConfig, L10nLocale, L10nStorage } from 'angular-l10n'+import { L10nConfig, L10nLocale, L10nMissingTranslationHandler, L10nStorage, L10nTranslationLoader } from 'angular-l10n'+import { from, Observable, of } from 'rxjs'+import { catchError, map } from 'rxjs/operators'import 'dayjs/locale/fr'-import enLocale from './en.json'-import frLocale from './fr.json'+import { USER_LANGUAGE_AUTO } from '../app/applications/users/user.constants'-export const i18nAsset: any = { en: enLocale, fr: frLocale }--export const i18nLanguageText = { auto: 'Auto', en: 'English', fr: 'Français' }+export const i18nLanguageText = { [USER_LANGUAGE_AUTO]: 'Auto', en: 'English', fr: 'Français' }export const l10nConfig: L10nConfig = {format: 'language',- providers: [{ name: 'app', asset: i18nAsset }],+ // Provider without static asset: resources will be loaded through TranslationLoader+ providers: [{ name: 'app', asset: 'app' }],fallback: false,cache: true,keySeparator: '|',@@ -50,19 +50,23 @@ export class TranslationStorage implements L10nStorage {}}-// @Injectable()-// export class TranslationLoader implements L10nTranslationLoader {-// public get(language: string, provider: L10nProvider): Observable<{ [key: string]: any }> {-// const data = import(`./${language}.json`)-// console.log(data)-// return from(data)-// }-// }+@Injectable()+export class TranslationLoader implements L10nTranslationLoader {+ public get(language: string): Observable<Record<string, any>> {+ // Dynamically load the JSON file for the requested language+ return from(import(`./${language}.json`)).pipe(+ map((module: any) => module?.default ?? module ?? {}),+ catchError(() => of({}))+ )+ }+}-// @Injectable()-// export class TranslationMissing implements L10nMissingTranslationHandler {-// public handle(key: string, value?: string, params?: any): string | any {-// console.error('translation missing: ', key, value, params)-// return 'no translation'-// }-// }+@Injectable()+export class TranslationMissing implements L10nMissingTranslationHandler {+ public handle(key: string, value?: string, params?: any): string | any {+ // Log missing translations and return the key by default+ // to make it easier to spot during development+ console.error('translation missing: ', key, value, params)+ return key ?? 'no translation'+ }+}