From 309d1f9d649daa08bb9b068af014749f6d4a5bce Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 06 Jul 2018 14:00:45 +0800
Subject: [PATCH] 设备和监控点父页面 筛选条件不予 编辑页面联动
---
src/app/core/i18n/i18n.service.ts | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/src/app/core/i18n/i18n.service.ts b/src/app/core/i18n/i18n.service.ts
index 9e8fc05..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: '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