Merge pull request #74 from topqiang/master

完善支持zh_hk
uxcore · Sep 15, 2020 · b587a14 · b587a14
2 parents cd1a623 + f391745
commit b587a14
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 0 deletions.
diff --git a/src/Calendar.jsx b/src/Calendar.jsx
@@ -14,9 +14,13 @@ const CalendarLocale = {};
 
 CalendarLocale['zh-cn'] = require('rc-calendar/lib/locale/zh_CN');
 CalendarLocale['en-us'] = require('rc-calendar/lib/locale/en_US');
+CalendarLocale['zh-hk'] = require('rc-calendar/lib/locale/zh_TW');
+
 
 CalendarLocale['zh-cn'] = { ...CalendarLocale['zh-cn'], ...i18n['zh-cn'] };
 CalendarLocale['en-us'] = { ...CalendarLocale['en-us'], ...i18n['en-us'] };
+CalendarLocale['zh-hk'] = { ...CalendarLocale['zh-hk'], ...i18n['zh-hk'] };
+
 
 const { getCalendarContainer, generalizeFormat } = util;
 
@@ -56,6 +60,11 @@ class Calendar extends React.Component {
         time: 'YYYY-MM-DD HH:mm:ss',
         am: 'YYYY-MM-DD a',
       },
+      'zh-hk': {
+        day: 'YYYY-MM-DD',
+        time: 'YYYY-MM-DD HH:mm:ss',
+        am: 'YYYY-MM-DD a',
+      },
       'en-us': {
         day: 'DD/MM/YYYY',
         time: 'DD/MM/YYYY HH:mm:ss',

diff --git a/src/CalendarFull.jsx b/src/CalendarFull.jsx
@@ -11,9 +11,12 @@ const CalendarLocale = {};
 
 CalendarLocale['zh-cn'] = require('rc-calendar/lib/locale/zh_CN');
 CalendarLocale['en-us'] = require('rc-calendar/lib/locale/en_US');
+CalendarLocale['zh-hk'] = require('rc-calendar/lib/locale/zh_TW');
+
 
 CalendarLocale['zh-cn'] = { ...CalendarLocale['zh-cn'], ...i18n['zh-cn'] };
 CalendarLocale['en-us'] = { ...CalendarLocale['en-us'], ...i18n['en-us'] };
+CalendarLocale['zh-hk'] = { ...CalendarLocale['zh-hk'], ...i18n['zh-hk'] };
 
 const { generalizeFormat } = util;
 
@@ -41,6 +44,7 @@ export default class FullCalendar extends React.Component {
     if (format) return format;
     const defaultFormatMap = {
       'zh-cn': { day: 'YYYY-MM-DD', time: 'YYYY-MM-DD HH:mm' },
+      'zh-hk': { day: 'YYYY-MM-DD', time: 'YYYY-MM-DD HH:mm' },
       'en-us': { day: 'DD/MM/YYYY', time: 'DD/MM/YYYY HH:mm' },
       en: { day: 'DD/MM/YYYY', time: 'DD/MM/YYYY HH:mm' },
     };

diff --git a/src/MonthCalendar.jsx b/src/MonthCalendar.jsx
@@ -12,6 +12,7 @@ const { getCalendarContainer, generalizeFormat } = util;
 
 CalendarLocale['zh-cn'] = require('rc-calendar/lib/locale/zh_CN');
 CalendarLocale['en-us'] = require('rc-calendar/lib/locale/en_US');
+CalendarLocale['zh-hk'] = require('rc-calendar/lib/locale/zh_TW');
 
 class MonthCalendar extends React.Component {
   constructor(props) {

diff --git a/src/RangeCalendar.jsx b/src/RangeCalendar.jsx
@@ -15,9 +15,12 @@ const CalendarLocale = {};
 
 CalendarLocale['zh-cn'] = require('rc-calendar/lib/locale/zh_CN');
 CalendarLocale['en-us'] = require('rc-calendar/lib/locale/en_US');
+CalendarLocale['zh-hk'] = require('rc-calendar/lib/locale/zh_TW');
+
 
 CalendarLocale['zh-cn'] = { ...CalendarLocale['zh-cn'], ...i18n['zh-cn'] };
 CalendarLocale['en-us'] = { ...CalendarLocale['en-us'], ...i18n['en-us'] };
+CalendarLocale['zh-hk'] = { ...CalendarLocale['zh-hk'], ...i18n['zh-hk'] };
 
 const { getCalendarContainer, generalizeFormat } = util;
 
@@ -54,6 +57,10 @@ class Calendar extends React.Component {
         day: 'YYYY-MM-DD',
         time: 'YYYY-MM-DD HH:mm:ss',
       },
+      'zh-hk': {
+        day: 'YYYY-MM-DD',
+        time: 'YYYY-MM-DD HH:mm:ss',
+      },
       'en-us': {
         day: 'DD/MM/YYYY',
         time: 'DD/MM/YYYY HH:mm:ss',

diff --git a/src/YearCalendar.jsx b/src/YearCalendar.jsx
@@ -11,6 +11,7 @@ const CalendarLocale = {};
 
 CalendarLocale['zh-cn'] = require('rc-calendar/lib/locale/zh_CN');
 CalendarLocale['en-us'] = require('rc-calendar/lib/locale/en_US');
+CalendarLocale['zh-hk'] = require('rc-calendar/lib/locale/zh_TW');
 
 
 const { getCalendarContainer, generalizeFormat } = util;