From 5afab423480b11bd51b423ab4e7789af8755e426 Mon Sep 17 00:00:00 2001 From: Jesse Stanger Date: Wed, 25 Jul 2018 23:00:55 +1000 Subject: [PATCH] Fix translate pipe not working by exporting app module and importing in sub module. --- src/app/@theme/theme.module.ts | 3 ++- src/app/app.component.ts | 6 +++++- src/app/app.module.ts | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/app/@theme/theme.module.ts b/src/app/@theme/theme.module.ts index 2a800bf..3da072f 100644 --- a/src/app/@theme/theme.module.ts +++ b/src/app/@theme/theme.module.ts @@ -2,6 +2,7 @@ import { ModuleWithProviders, NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; +import { TranslateModule } from '@ngx-translate/core'; import { NbActionsModule, @@ -43,7 +44,7 @@ import { DEFAULT_THEME } from './styles/theme.default'; import { COSMIC_THEME } from './styles/theme.cosmic'; import { CORPORATE_THEME } from './styles/theme.corporate'; -const BASE_MODULES = [CommonModule, FormsModule, ReactiveFormsModule]; +const BASE_MODULES = [CommonModule, FormsModule, ReactiveFormsModule, TranslateModule]; const NB_MODULES = [ NbCardModule, diff --git a/src/app/app.component.ts b/src/app/app.component.ts index b380028..50b7e2f 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -11,11 +11,15 @@ import { AnalyticsService } from './@core/utils/analytics.service'; export class AppComponent implements OnInit { constructor( public electronService: ElectronService, - private translate: TranslateService, + public translate: TranslateService, private analytics: AnalyticsService ) { + translate.addLangs(['en', 'fr', 'cn']); translate.setDefaultLang('en'); + const browserLang = translate.getBrowserLang(); + translate.use(browserLang.match(/en|fr|cn/) ? browserLang : 'en'); + console.log('AppConfig', AppConfig); if (electronService.isElectron()) { diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 3014665..fc41355 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -49,6 +49,7 @@ export function HttpLoaderFactory(http: HttpClient) { } }) ], + exports: [TranslateModule], providers: [ ElectronService, { provide: APP_BASE_HREF, useValue: '/' }