Merge pull request edp963#1994 from scottsut/moment_locale

fix: moment locale issue
xxxllluuu · Oct 29, 2020 · 567412d · 567412d
2 parents 95ee2d1 + d3b660e
commit 567412d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/webapp/app/app.tsx b/webapp/app/app.tsx
@@ -33,7 +33,7 @@ import zh_CN from 'antd/es/locale/zh_CN'
 import LanguageProvider from 'containers/LanguageProvider'
 import { translationMessages } from './i18n'
 import moment from 'moment'
-import 'moment/src/locale/zh-cn'
+import 'moment/dist/locale/zh-cn'
 moment.locale('zh-cn')
 
 import '!file-loader?name=[name].[ext]!./favicon.ico'

diff --git a/webapp/package.json b/webapp/package.json
@@ -84,6 +84,7 @@
     "lodash": "4.17.19",
     "memoize-one": "^5.0.0",
     "minimist": "1.2.3",
+    "moment": "^2.24.0",
     "prop-types": "15.6.2",
     "react": "16.8.6",
     "react-ace": "^8.1.0",

diff --git a/webapp/share/app.tsx b/webapp/share/app.tsx
@@ -33,7 +33,7 @@ import zh_CN from 'antd/es/locale/zh_CN'
 import LanguageProvider from 'app/containers/LanguageProvider'
 import { translationMessages } from 'app/i18n'
 import moment from 'moment'
-import 'moment/src/locale/zh-cn'
+import 'moment/dist/locale/zh-cn'
 moment.locale('zh-cn')
 
 import '!file-loader?name=[name].[ext]!../app/favicon.ico'