feat(module:locale): support change locale at the runtime (globally)

NG-ZORRO · Oct 28, 2017 · af6c926 · af6c926
1 parent 5ec27d3
commit af6c926
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 14 deletions.
diff --git a/src/components/locale/locales/en-US.ts b/src/components/locale/locales/en-US.ts
@@ -1,12 +1,7 @@
 import { NzLocale } from '../nz-locale.class';
-import * as moment from 'moment';
-
-const LOCALE = 'en-US';
-
-moment.locale(LOCALE);
 
 export const enUS: NzLocale = {
-  locale: LOCALE,
+  locale: 'en-US',
 
   Pagination: {
     itemsPerPage: '%num% / page',

diff --git a/src/components/locale/locales/zh-CN.ts b/src/components/locale/locales/zh-CN.ts
@@ -1,12 +1,7 @@
 import { NzLocale } from '../nz-locale.class';
-import * as moment from 'moment';
-
-const LOCALE = 'zh-CN';
-
-moment.locale(LOCALE);
 
 export const zhCN: NzLocale = {
-  locale: LOCALE,
+  locale: 'zh-CN',
 
   Pagination: {
     itemsPerPage: '%num% 条/页',

diff --git a/src/components/locale/nz-locale.service.ts b/src/components/locale/nz-locale.service.ts
@@ -2,6 +2,7 @@ import { Injectable, Inject, Provider, Optional, SkipSelf } from '@angular/core'
 import { LoggerService } from '../util/logger/index';
 import { NZ_LOCALE } from './nz-locale.token';
 import { NzLocale } from './nz-locale.class';
+import * as moment from 'moment';
 
 @Injectable()
 export class NzLocaleService {
@@ -25,7 +26,13 @@ export class NzLocaleService {
     return path;
   }
 
+  /**
+   * Set/Change current locale globally throughout the WHOLE application
+   * [NOTE] If called at runtime, rendered interface may not change along with the locale change (because this do not trigger another render schedule)
+   * @param locale The translating letters
+   */
   setLocale(locale: NzLocale) {
+    moment.locale(locale.locale);
     this._locale = locale;
   }
 

diff --git a/src/showcase/nz-demo-locale/nz-demo-locale-all.component.ts b/src/showcase/nz-demo-locale/nz-demo-locale-all.component.ts
@@ -1,5 +1,4 @@
 import { Component, OnInit } from '@angular/core';
-import * as moment from 'moment';
 import { zhCN, enUS, NzModalService, NzLocaleService } from '../../../index.showcase';
 
 @Component({
@@ -38,7 +37,6 @@ export class NzDemoLocaleAllComponent implements OnInit {
   set locale(locale) {
     this._locale = locale;
     /* Switch locale manually (DEMO ONLY) */
-    moment.locale(locale.locale);
     this._localeService.setLocale(locale);
   }