From 3405a42d4434bb77026c029ed20f2898ba665107 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 11 Jan 2018 09:25:50 +0800
Subject: [PATCH] 框架升级

---
 src/app/core/i18n/i18n.service.ts |   22 +++++++++++++++-------
 1 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/app/core/i18n/i18n.service.ts b/src/app/core/i18n/i18n.service.ts
index 9e8fc05..b01d206 100644
--- a/src/app/core/i18n/i18n.service.ts
+++ b/src/app/core/i18n/i18n.service.ts
@@ -8,24 +8,25 @@
 @Injectable()
 export class I18NService implements AlainI18NService {
 
-    private _default = 'en';
+    private _default = 'zh-CN';
 
     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 +36,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