summaryrefslogtreecommitdiffstats
path: root/js/vendor/momentjs/locale/zh-cn.js
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2014-11-27 16:19:56 +0100
committerBernhard Posselt <dev@bernhard-posselt.com>2014-11-27 16:19:56 +0100
commit01fe3a627ea76c10ec759fb070ea47a0851a0636 (patch)
tree5f9c0b94742e070f20ab111766d3218bd6c7510f /js/vendor/momentjs/locale/zh-cn.js
parent7c34fee7ebc09ffaaf14019ae195b1b42e138e3f (diff)
version bump
Diffstat (limited to 'js/vendor/momentjs/locale/zh-cn.js')
-rw-r--r--js/vendor/momentjs/locale/zh-cn.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/js/vendor/momentjs/locale/zh-cn.js b/js/vendor/momentjs/locale/zh-cn.js
index aff26c5e7..b8a0bd2ea 100644
--- a/js/vendor/momentjs/locale/zh-cn.js
+++ b/js/vendor/momentjs/locale/zh-cn.js
@@ -9,7 +9,7 @@
} else if (typeof exports === 'object') {
module.exports = factory(require('../moment')); // Node
} else {
- factory(window.moment); // Browser global
+ factory((typeof global !== 'undefined' ? global : this).moment); // node or other global
}
}(function (moment) {
return moment.defineLocale('zh-cn', {
@@ -20,6 +20,7 @@
weekdaysMin : '日_一_二_三_四_五_六'.split('_'),
longDateFormat : {
LT : 'Ah点mm',
+ LTS : 'Ah点m分s秒',
L : 'YYYY-MM-DD',
LL : 'YYYY年MMMD日',
LLL : 'YYYY年MMMD日LT',
@@ -69,6 +70,7 @@
},
sameElse : 'LL'
},
+ ordinalParse: /\d{1,2}(日|月|周)/,
ordinal : function (number, period) {
switch (period) {
case 'd':