Fixing locales in fuse. Coercing zh to zh-cn for moment.

2 files changed, 13 insertions, 2 deletions

diff --git a/ui/fuse.js b/ui/fuse.js
index 4755d9f5..f77effbd 100644
--- a/ui/fuse.js
+++ b/ui/fuse.js
@@ -24,6 +24,9 @@ Sparky.task('config', _ => {
     transformers: {
       before: [transformClasscat(), transformInferno()],
     },
+    alias: {
+      'locale': 'moment/locale'
+		},
     plugins: [
       EnvPlugin({ NODE_ENV: isProduction ? 'production' : 'development' }),
       CSSPlugin(),
diff --git a/ui/src/components/moment-time.tsx b/ui/src/components/moment-time.tsx
index 021cf5f7..77dcaf86 100644
--- a/ui/src/components/moment-time.tsx
+++ b/ui/src/components/moment-time.tsx
@@ -1,6 +1,7 @@
 import { Component } from 'inferno';
 import * as moment from 'moment';
-// import 'moment/locale/de.js';
+// import 'moment/locale/de';
+import 'moment/locale/zh-cn';
 import { getLanguage } from '../utils';
 import { i18n } from '../i18next';
 
@@ -16,7 +17,14 @@ export class MomentTime extends Component<MomentTimeProps, any> {
 
   constructor(props: any, context: any) {
     super(props, context);
-    moment.locale(getLanguage());
+
+    // Moment doesnt have zh, only zh-cn
+    let lang = getLanguage();
+    if (lang == 'zh') {
+      lang = 'zh-cn';
+    }
+
+    moment.locale(lang);
   }
 
   render() {