From 2ab23c2c9eae40fbb9e065f404d18468b55bfb9e Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Wed, 24 Jan 2018 14:59:03 -0500 Subject: [PATCH] i18n service and helpers --- src/_locales/en/messages.json | 5 +++ src/_locales/es/messages.json | 5 +++ src/app/accounts/login.component.ts | 1 - src/app/app.module.ts | 2 + src/app/pipes/i18n.pipe.ts | 18 +++++++++ src/app/services/services.module.ts | 20 +++++++++- src/app/vault/view.component.html | 24 ++++++----- src/services/i18n.service.ts | 62 +++++++++++++++++++++++++++++ webpack.main.js | 1 + 9 files changed, 124 insertions(+), 14 deletions(-) create mode 100644 src/_locales/en/messages.json create mode 100644 src/_locales/es/messages.json create mode 100644 src/app/pipes/i18n.pipe.ts create mode 100644 src/services/i18n.service.ts diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json new file mode 100644 index 00000000..6aadcda8 --- /dev/null +++ b/src/_locales/en/messages.json @@ -0,0 +1,5 @@ +{ + "hello": { + "message": "hello" + } +} diff --git a/src/_locales/es/messages.json b/src/_locales/es/messages.json new file mode 100644 index 00000000..58f7f7f4 --- /dev/null +++ b/src/_locales/es/messages.json @@ -0,0 +1,5 @@ +{ + "hello": { + "message": "hola" + } +} diff --git a/src/app/accounts/login.component.ts b/src/app/accounts/login.component.ts index c1313290..26db456c 100644 --- a/src/app/accounts/login.component.ts +++ b/src/app/accounts/login.component.ts @@ -18,7 +18,6 @@ export class LoginComponent implements OnInit { masterPassword: string = ''; constructor(private authService: AuthService, private router: Router) { - } ngOnInit() { diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 19a2c081..bc5eb9e7 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -11,6 +11,7 @@ import { AppComponent } from './app.component'; import { CiphersComponent } from './vault/ciphers.component'; import { FallbackSrcDirective } from './directives/fallback-src.directive'; import { GroupingsComponent } from './vault/groupings.component'; +import { I18nPipe } from './pipes/i18n.pipe'; import { IconComponent } from './vault/icon.component'; import { LoginComponent } from './accounts/login.component'; import { StopClickDirective } from './directives/stop-click.directive'; @@ -30,6 +31,7 @@ import { ViewComponent } from './vault/view.component'; CiphersComponent, FallbackSrcDirective, GroupingsComponent, + I18nPipe, IconComponent, LoginComponent, StopClickDirective, diff --git a/src/app/pipes/i18n.pipe.ts b/src/app/pipes/i18n.pipe.ts new file mode 100644 index 00000000..0e0c3a1a --- /dev/null +++ b/src/app/pipes/i18n.pipe.ts @@ -0,0 +1,18 @@ +import { + Pipe, + PipeTransform, +} from '@angular/core'; + +import { I18nService } from '../../services/i18n.service'; + +@Pipe({ + name: 'i18n', +}) +export class I18nPipe implements PipeTransform { + constructor(private i18nService: I18nService) { + } + + transform(id: string): string { + return this.i18nService.t(id); + } +} diff --git a/src/app/services/services.module.ts b/src/app/services/services.module.ts index 49d473b2..ba5110e0 100644 --- a/src/app/services/services.module.ts +++ b/src/app/services/services.module.ts @@ -1,11 +1,15 @@ import { webFrame } from 'electron'; -import { NgModule } from '@angular/core'; +import { + APP_INITIALIZER, + NgModule +} from '@angular/core'; import { DesktopMessagingService } from '../../services/desktopMessaging.service'; import { DesktopPlatformUtilsService } from '../../services/desktopPlatformUtils.service'; import { DesktopStorageService } from '../../services/desktopStorage.service'; import { DesktopSecureStorageService } from '../../services/desktopSecureStorage.service'; +import { I18nService } from '../../services/i18n.service'; import { ApiService, @@ -52,6 +56,7 @@ import { webFrame.registerURLSchemeAsPrivileged('file'); +const i18nService = new I18nService(window, './_locales'); const utilsService = new UtilsService(); const platformUtilsService = new DesktopPlatformUtilsService(); const messagingService = new DesktopMessagingService(); @@ -69,7 +74,7 @@ const settingsService = new SettingsService(userService, storageService); const cipherService = new CipherService(cryptoService, userService, settingsService, apiService, storageService); const folderService = new FolderService(cryptoService, userService, - () => 'No Folder', apiService, storageService); + () => i18nService.t('noneFolder'), apiService, storageService); const collectionService = new CollectionService(cryptoService, userService, storageService); const lockService = new LockService(cipherService, folderService, collectionService, cryptoService, platformUtilsService, storageService, @@ -89,6 +94,10 @@ environmentService.setUrlsFromStorage().then(() => { return syncService.fullSync(true); }); +function initFactory(i18n: I18nService): Function { + return () => i18n.init(); +} + @NgModule({ imports: [], declarations: [], @@ -98,6 +107,13 @@ environmentService.setUrlsFromStorage().then(() => { { provide: FolderServiceAbstraction, useValue: folderService }, { provide: CollectionServiceAbstraction, useValue: collectionService }, { provide: EnvironmentServiceAbstraction, useValue: environmentService }, + { provide: I18nService, useValue: i18nService }, + { + provide: APP_INITIALIZER, + useFactory: initFactory, + deps: [I18nService], + multi: true + } ], }) export class ServicesModule { diff --git a/src/app/vault/view.component.html b/src/app/vault/view.component.html index 457b26bf..d84f9f73 100644 --- a/src/app/vault/view.component.html +++ b/src/app/vault/view.component.html @@ -9,17 +9,19 @@ Name {{cipher.name}} -
- URI - {{cipher.login.uri}} -
-
- Username - {{cipher.login.username}} -
-
- Password - {{cipher.login.password}} +
+
+ URI + {{cipher.login.uri}} +
+
+ Username + {{cipher.login.username}} +
+
+ Password + {{cipher.login.password}} +
diff --git a/src/services/i18n.service.ts b/src/services/i18n.service.ts new file mode 100644 index 00000000..1feeef64 --- /dev/null +++ b/src/services/i18n.service.ts @@ -0,0 +1,62 @@ +// First locale is the default (English) +const SupportedLocales = [ + 'en', 'es', +]; + +export class I18nService { + defaultMessages: any = {}; + localeMessages: any = {}; + systemLanguage: string; + language: string; + inited: boolean; + + constructor(win: Window, private localesDirectory: string) { + this.systemLanguage = win.navigator.language; + } + + async init(language?: string) { + if (this.inited) { + throw new Error('i18n already initialized.'); + } + + this.inited = true; + this.language = language != null ? language : this.systemLanguage; + + if (SupportedLocales.indexOf(this.language) === -1) { + this.language = this.language.slice(0, 2); + + if (SupportedLocales.indexOf(this.language) === -1) { + this.language = SupportedLocales[0]; + } + } + + await this.loadMessages(this.language, this.localeMessages); + if (this.language !== SupportedLocales[0]) { + await this.loadMessages(SupportedLocales[0], this.defaultMessages); + } + } + + t(id: string): string { + return this.translation(id); + } + + translation(id: string): string { + if (this.localeMessages.hasOwnProperty(id) && this.localeMessages[id]) { + return this.localeMessages[id]; + } else if (this.defaultMessages.hasOwnProperty(id) && this.defaultMessages[id]) { + return this.defaultMessages[id]; + } + return ''; + } + + private async loadMessages(locale: string, messagesObj: any): Promise { + const formattedLocale = locale.replace('-', '_'); + const file = await fetch(this.localesDirectory + '/' + formattedLocale + '/messages.json'); + const locales = await file.json(); + for (const prop in locales) { + if (locales.hasOwnProperty(prop)) { + messagesObj[prop] = locales[prop].message; + } + } + } +} diff --git a/webpack.main.js b/webpack.main.js index 4c07085a..e878aa2c 100644 --- a/webpack.main.js +++ b/webpack.main.js @@ -57,6 +57,7 @@ const main = { new CopyWebpackPlugin([ './src/package.json', { from: './src/images', to: 'images' }, + { from: './src/_locales', to: '_locales' }, ]), ], externals: [nodeExternals()]