diff options
author | Bernhard Posselt <dev@bernhard-posselt.com> | 2015-01-27 09:19:51 +0100 |
---|---|---|
committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2015-01-27 09:19:51 +0100 |
commit | 1bc1507dd4d92c841e9a56c7d4c241dd7fa1c25f (patch) | |
tree | 81dd4f94f002c03f11a3982e0e3a34296160db4d /js/vendor/momentjs/locale/zh-cn.js | |
parent | 3fbc4c6b9a6574830a7acc9485d8c5cad9f5e6a8 (diff) |
update clientside libs
Diffstat (limited to 'js/vendor/momentjs/locale/zh-cn.js')
-rw-r--r-- | js/vendor/momentjs/locale/zh-cn.js | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/js/vendor/momentjs/locale/zh-cn.js b/js/vendor/momentjs/locale/zh-cn.js index b8a0bd2ea..da834165b 100644 --- a/js/vendor/momentjs/locale/zh-cn.js +++ b/js/vendor/momentjs/locale/zh-cn.js @@ -30,6 +30,21 @@ lll : 'YYYY年MMMD日LT', llll : 'YYYY年MMMD日ddddLT' }, + meridiemParse: /凌晨|早上|上午|中午|下午|晚上/, + meridiemHour: function (hour, meridiem) { + if (hour === 12) { + hour = 0; + } + if (meridiem === '凌晨' || meridiem === '早上' || + meridiem === '上午') { + return hour; + } else if (meridiem === '下午' || meridiem === '晚上') { + return hour + 12; + } else { + // '中午' + return hour >= 11 ? hour : hour + 12; + } + }, meridiem : function (hour, minute, isLower) { var hm = hour * 100 + minute; if (hm < 600) { |