From 1dfc8bc300a6ae0822514ddf2e1399d4762fa1b1 Mon Sep 17 00:00:00 2001 From: 沈斌 <bluelazysb@hotmail.com> Date: Thu, 12 Jul 2018 14:01:00 +0800 Subject: [PATCH] updates --- src/app/core/i18n/i18n.service.ts | 27 ++++++++++++++++++--------- 1 files changed, 18 insertions(+), 9 deletions(-) diff --git a/src/app/core/i18n/i18n.service.ts b/src/app/core/i18n/i18n.service.ts index e046d53..cf17dd2 100644 --- a/src/app/core/i18n/i18n.service.ts +++ b/src/app/core/i18n/i18n.service.ts @@ -8,24 +8,26 @@ @Injectable() export class I18NService implements AlainI18NService { - private _default = 'en'; + private _default = 'zh-CN'; + // ������������������ ��������� by fx private _langs = [ - { code: 'en', text: 'English' }, - { code: 'zh-CN', text: '������' } + { code: 'zh-CN', text: '������' }, + { code: 'en', text: 'English' } ]; - constructor(settings: SettingsService, + constructor( + settings: SettingsService, private nzLocalService: NzLocaleService, private translate: TranslateService, - private injector: Injector) { + private injector: Injector + ) { this._default = settings.layout.lang || translate.getBrowserLang(); const lans = this._langs.map(item => item.code); if (!lans.includes(this._default)) { this._default = lans[0]; } translate.addLangs(lans); - translate.setDefaultLang(this._default); } use(lang: string = null, firstLoad = true): Observable<any> { @@ -35,13 +37,20 @@ if (!firstLoad) this.injector.get(Router).navigate([ '/' ]); return this.translate.use(lang); } - + /** ������������������ */ getLangs() { return this._langs; } - + /** ������ */ fanyi(key: string) { return this.translate.instant(key); } - + /** ������������ */ + get defaultLang() { + return this._default; + } + /** ������������ */ + get currentLang() { + return this.translate.currentLang || this.translate.getDefaultLang() || this._default; + } } -- Gitblit v1.8.0