From 1bc1507dd4d92c841e9a56c7d4c241dd7fa1c25f Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Tue, 27 Jan 2015 09:19:51 +0100 Subject: update clientside libs --- js/vendor/momentjs/locale/af.js | 4 +++ js/vendor/momentjs/locale/ar-sa.js | 4 +++ js/vendor/momentjs/locale/ar-tn.js | 55 ++++++++++++++++++++++++++++++ js/vendor/momentjs/locale/ar.js | 4 +++ js/vendor/momentjs/locale/az.js | 4 +++ js/vendor/momentjs/locale/be.js | 6 ++-- js/vendor/momentjs/locale/bn.js | 4 +++ js/vendor/momentjs/locale/bo.js | 4 +++ js/vendor/momentjs/locale/eo.js | 4 +++ js/vendor/momentjs/locale/fa.js | 4 +++ js/vendor/momentjs/locale/fy.js | 69 ++++++++++++++++++++++++++++++++++++++ js/vendor/momentjs/locale/he.js | 2 ++ js/vendor/momentjs/locale/hi.js | 15 +++++++++ js/vendor/momentjs/locale/hu.js | 4 +++ js/vendor/momentjs/locale/hy-am.js | 4 +++ js/vendor/momentjs/locale/id.js | 13 +++++++ js/vendor/momentjs/locale/ja.js | 4 +++ js/vendor/momentjs/locale/ko.js | 8 ++--- js/vendor/momentjs/locale/ml.js | 4 +++ js/vendor/momentjs/locale/mr.js | 15 +++++++++ js/vendor/momentjs/locale/ms-my.js | 13 +++++++ js/vendor/momentjs/locale/ne.js | 15 +++++++++ js/vendor/momentjs/locale/sq.js | 4 +++ js/vendor/momentjs/locale/ta.js | 42 ++++++++++++++++------- js/vendor/momentjs/locale/th.js | 4 +++ js/vendor/momentjs/locale/uk.js | 4 +++ js/vendor/momentjs/locale/zh-cn.js | 15 +++++++++ js/vendor/momentjs/locale/zh-tw.js | 13 +++++++ 28 files changed, 322 insertions(+), 19 deletions(-) create mode 100644 js/vendor/momentjs/locale/ar-tn.js create mode 100644 js/vendor/momentjs/locale/fy.js (limited to 'js/vendor/momentjs/locale') diff --git a/js/vendor/momentjs/locale/af.js b/js/vendor/momentjs/locale/af.js index 2fb7adff2..9c7ad95d8 100644 --- a/js/vendor/momentjs/locale/af.js +++ b/js/vendor/momentjs/locale/af.js @@ -17,6 +17,10 @@ weekdays : 'Sondag_Maandag_Dinsdag_Woensdag_Donderdag_Vrydag_Saterdag'.split('_'), weekdaysShort : 'Son_Maa_Din_Woe_Don_Vry_Sat'.split('_'), weekdaysMin : 'So_Ma_Di_Wo_Do_Vr_Sa'.split('_'), + meridiemParse: /vm|nm/i, + isPM : function (input) { + return /^nm$/i.test(input); + }, meridiem : function (hours, minutes, isLower) { if (hours < 12) { return isLower ? 'vm' : 'VM'; diff --git a/js/vendor/momentjs/locale/ar-sa.js b/js/vendor/momentjs/locale/ar-sa.js index ea7e2f6b4..731f97be3 100644 --- a/js/vendor/momentjs/locale/ar-sa.js +++ b/js/vendor/momentjs/locale/ar-sa.js @@ -49,6 +49,10 @@ LLL : 'D MMMM YYYY LT', LLLL : 'dddd D MMMM YYYY LT' }, + meridiemParse: /ص|م/, + isPM : function (input) { + return 'م' === input; + }, meridiem : function (hour, minute, isLower) { if (hour < 12) { return 'ص'; diff --git a/js/vendor/momentjs/locale/ar-tn.js b/js/vendor/momentjs/locale/ar-tn.js new file mode 100644 index 000000000..b1ddb4ff0 --- /dev/null +++ b/js/vendor/momentjs/locale/ar-tn.js @@ -0,0 +1,55 @@ +// moment.js locale configuration +// locale : Tunisian Arabic (ar-tn) + +(function (factory) { + if (typeof define === 'function' && define.amd) { + define(['moment'], factory); // AMD + } else if (typeof exports === 'object') { + module.exports = factory(require('../moment')); // Node + } else { + factory((typeof global !== 'undefined' ? global : this).moment); // node or other global + } +}(function (moment) { + return moment.defineLocale('ar-tn', { + months: 'جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'), + monthsShort: 'جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'), + weekdays: 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'), + weekdaysShort: 'أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت'.split('_'), + weekdaysMin: 'ح_ن_ث_ر_خ_ج_س'.split('_'), + longDateFormat: { + LT: 'HH:mm', + LTS: 'LT:ss', + L: 'DD/MM/YYYY', + LL: 'D MMMM YYYY', + LLL: 'D MMMM YYYY LT', + LLLL: 'dddd D MMMM YYYY LT' + }, + calendar: { + sameDay: '[اليوم على الساعة] LT', + nextDay: '[غدا على الساعة] LT', + nextWeek: 'dddd [على الساعة] LT', + lastDay: '[أمس على الساعة] LT', + lastWeek: 'dddd [على الساعة] LT', + sameElse: 'L' + }, + relativeTime: { + future: 'في %s', + past: 'منذ %s', + s: 'ثوان', + m: 'دقيقة', + mm: '%d دقائق', + h: 'ساعة', + hh: '%d ساعات', + d: 'يوم', + dd: '%d أيام', + M: 'شهر', + MM: '%d أشهر', + y: 'سنة', + yy: '%d سنوات' + }, + week: { + dow: 1, // Monday is the first day of the week. + doy: 4 // The week that contains Jan 4th is the first week of the year. + } + }); +})); diff --git a/js/vendor/momentjs/locale/ar.js b/js/vendor/momentjs/locale/ar.js index d6450087d..828e61876 100644 --- a/js/vendor/momentjs/locale/ar.js +++ b/js/vendor/momentjs/locale/ar.js @@ -82,6 +82,10 @@ LLL : 'D MMMM YYYY LT', LLLL : 'dddd D MMMM YYYY LT' }, + meridiemParse: /ص|م/, + isPM : function (input) { + return 'م' === input; + }, meridiem : function (hour, minute, isLower) { if (hour < 12) { return 'ص'; diff --git a/js/vendor/momentjs/locale/az.js b/js/vendor/momentjs/locale/az.js index d4d143426..7624feea7 100644 --- a/js/vendor/momentjs/locale/az.js +++ b/js/vendor/momentjs/locale/az.js @@ -73,6 +73,10 @@ y : 'bir il', yy : '%d il' }, + meridiemParse: /gecə|səhər|gündüz|axşam/, + isPM : function (input) { + return /^(gündüz|axşam)$/.test(input); + }, meridiem : function (hour, minute, isLower) { if (hour < 4) { return 'gecə'; diff --git a/js/vendor/momentjs/locale/be.js b/js/vendor/momentjs/locale/be.js index 68a6f37cb..d888e21c4 100644 --- a/js/vendor/momentjs/locale/be.js +++ b/js/vendor/momentjs/locale/be.js @@ -114,8 +114,10 @@ y : 'год', yy : relativeTimeWithPlural }, - - + meridiemParse: /ночы|раніцы|дня|вечара/, + isPM : function (input) { + return /^(дня|вечара)$/.test(input); + }, meridiem : function (hour, minute, isLower) { if (hour < 4) { return 'ночы'; diff --git a/js/vendor/momentjs/locale/bn.js b/js/vendor/momentjs/locale/bn.js index e9549d993..5b4ab515e 100644 --- a/js/vendor/momentjs/locale/bn.js +++ b/js/vendor/momentjs/locale/bn.js @@ -83,6 +83,10 @@ return symbolMap[match]; }); }, + meridiemParse: /রাত|শকাল|দুপুর|বিকেল|রাত/, + isPM: function (input) { + return /^(দুপুর|বিকেল|রাত)$/.test(input); + }, //Bengali is a vast language its spoken //in different forms in various parts of the world. //I have just generalized with most common one used diff --git a/js/vendor/momentjs/locale/bo.js b/js/vendor/momentjs/locale/bo.js index cece8d133..b8e7001aa 100644 --- a/js/vendor/momentjs/locale/bo.js +++ b/js/vendor/momentjs/locale/bo.js @@ -83,6 +83,10 @@ return symbolMap[match]; }); }, + meridiemParse: /མཚན་མོ|ཞོགས་ཀས|ཉིན་གུང|དགོང་དག|མཚན་མོ/, + isPM: function (input) { + return /^(ཉིན་གུང|དགོང་དག|མཚན་མོ)$/.test(input); + }, meridiem : function (hour, minute, isLower) { if (hour < 4) { return 'མཚན་མོ'; diff --git a/js/vendor/momentjs/locale/eo.js b/js/vendor/momentjs/locale/eo.js index 6a3d097b9..9e3d04569 100644 --- a/js/vendor/momentjs/locale/eo.js +++ b/js/vendor/momentjs/locale/eo.js @@ -27,6 +27,10 @@ LLL : 'D[-an de] MMMM, YYYY LT', LLLL : 'dddd, [la] D[-an de] MMMM, YYYY LT' }, + meridiemParse: /[ap]\.t\.m/i, + isPM: function (input) { + return input.charAt(0).toLowerCase() === 'p'; + }, meridiem : function (hours, minutes, isLower) { if (hours > 11) { return isLower ? 'p.t.m.' : 'P.T.M.'; diff --git a/js/vendor/momentjs/locale/fa.js b/js/vendor/momentjs/locale/fa.js index ad2087a2e..6d765751c 100644 --- a/js/vendor/momentjs/locale/fa.js +++ b/js/vendor/momentjs/locale/fa.js @@ -49,6 +49,10 @@ LLL : 'D MMMM YYYY LT', LLLL : 'dddd, D MMMM YYYY LT' }, + meridiemParse: /قبل از ظهر|بعد از ظهر/, + isPM: function (input) { + return /بعد از ظهر/.test(input); + }, meridiem : function (hour, minute, isLower) { if (hour < 12) { return 'قبل از ظهر'; diff --git a/js/vendor/momentjs/locale/fy.js b/js/vendor/momentjs/locale/fy.js new file mode 100644 index 000000000..f86c249a3 --- /dev/null +++ b/js/vendor/momentjs/locale/fy.js @@ -0,0 +1,69 @@ +// moment.js locale configuration +// locale : frisian (fy) +// author : Robin van der Vliet : https://github.com/robin0van0der0v + +(function (factory) { + if (typeof define === 'function' && define.amd) { + define(['moment'], factory); // AMD + } else if (typeof exports === 'object') { + module.exports = factory(require('../moment')); // Node + } else { + factory((typeof global !== 'undefined' ? global : this).moment); // node or other global + } +}(function (moment) { + var monthsShortWithDots = 'jan._feb._mrt._apr._mai_jun._jul._aug._sep._okt._nov._des.'.split('_'), + monthsShortWithoutDots = 'jan_feb_mrt_apr_mai_jun_jul_aug_sep_okt_nov_des'.split('_'); + + return moment.defineLocale('fy', { + months : 'jannewaris_febrewaris_maart_april_maaie_juny_july_augustus_septimber_oktober_novimber_desimber'.split('_'), + monthsShort : function (m, format) { + if (/-MMM-/.test(format)) { + return monthsShortWithoutDots[m.month()]; + } else { + return monthsShortWithDots[m.month()]; + } + }, + weekdays : 'snein_moandei_tiisdei_woansdei_tongersdei_freed_sneon'.split('_'), + weekdaysShort : 'si._mo._ti._wo._to._fr._so.'.split('_'), + weekdaysMin : 'Si_Mo_Ti_Wo_To_Fr_So'.split('_'), + longDateFormat : { + LT : 'HH:mm', + LTS : 'LT:ss', + L : 'DD-MM-YYYY', + LL : 'D MMMM YYYY', + LLL : 'D MMMM YYYY LT', + LLLL : 'dddd D MMMM YYYY LT' + }, + calendar : { + sameDay: '[hjoed om] LT', + nextDay: '[moarn om] LT', + nextWeek: 'dddd [om] LT', + lastDay: '[juster om] LT', + lastWeek: '[ôfrûne] dddd [om] LT', + sameElse: 'L' + }, + relativeTime : { + future : 'oer %s', + past : '%s lyn', + s : 'in pear sekonden', + m : 'ien minút', + mm : '%d minuten', + h : 'ien oere', + hh : '%d oeren', + d : 'ien dei', + dd : '%d dagen', + M : 'ien moanne', + MM : '%d moannen', + y : 'ien jier', + yy : '%d jierren' + }, + ordinalParse: /\d{1,2}(ste|de)/, + ordinal : function (number) { + return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de'); + }, + week : { + dow : 1, // Monday is the first day of the week. + doy : 4 // The week that contains Jan 4th is the first week of the year. + } + }); +})); diff --git a/js/vendor/momentjs/locale/he.js b/js/vendor/momentjs/locale/he.js index 9f9f47051..d2f4b1336 100644 --- a/js/vendor/momentjs/locale/he.js +++ b/js/vendor/momentjs/locale/he.js @@ -70,6 +70,8 @@ yy : function (number) { if (number === 2) { return 'שנתיים'; + } else if (number % 10 === 0 && number !== 10) { + return number + ' שנה'; } return number + ' שנים'; } diff --git a/js/vendor/momentjs/locale/hi.js b/js/vendor/momentjs/locale/hi.js index 73deba5b1..173c4ee07 100644 --- a/js/vendor/momentjs/locale/hi.js +++ b/js/vendor/momentjs/locale/hi.js @@ -85,6 +85,21 @@ }, // Hindi notation for meridiems are quite fuzzy in practice. While there exists // a rigid notion of a 'Pahar' it is not used as rigidly in modern Hindi. + meridiemParse: /रात|सुबह|दोपहर|शाम/, + meridiemHour : function (hour, meridiem) { + if (hour === 12) { + hour = 0; + } + if (meridiem === 'रात') { + return hour < 4 ? hour : hour + 12; + } else if (meridiem === 'सुबह') { + return hour; + } else if (meridiem === 'दोपहर') { + return hour >= 10 ? hour : hour + 12; + } else if (meridiem === 'शाम') { + return hour + 12; + } + }, meridiem : function (hour, minute, isLower) { if (hour < 4) { return 'रात'; diff --git a/js/vendor/momentjs/locale/hu.js b/js/vendor/momentjs/locale/hu.js index 7eccd1d90..de8cae9c3 100644 --- a/js/vendor/momentjs/locale/hu.js +++ b/js/vendor/momentjs/locale/hu.js @@ -63,6 +63,10 @@ LLL : 'YYYY. MMMM D., LT', LLLL : 'YYYY. MMMM D., dddd LT' }, + meridiemParse: /de|du/i, + isPM: function (input) { + return input.charAt(1).toLowerCase() === 'u'; + }, meridiem : function (hours, minutes, isLower) { if (hours < 12) { return isLower === true ? 'de' : 'DE'; diff --git a/js/vendor/momentjs/locale/hy-am.js b/js/vendor/momentjs/locale/hy-am.js index 053a845e0..6e2de8ba6 100644 --- a/js/vendor/momentjs/locale/hy-am.js +++ b/js/vendor/momentjs/locale/hy-am.js @@ -78,6 +78,10 @@ yy : '%d տարի' }, + meridiemParse: /գիշերվա|առավոտվա|ցերեկվա|երեկոյան/, + isPM: function (input) { + return /^(ցերեկվա|երեկոյան)$/.test(input); + }, meridiem : function (hour) { if (hour < 4) { return 'գիշերվա'; diff --git a/js/vendor/momentjs/locale/id.js b/js/vendor/momentjs/locale/id.js index 36a841a61..fe0484971 100644 --- a/js/vendor/momentjs/locale/id.js +++ b/js/vendor/momentjs/locale/id.js @@ -26,6 +26,19 @@ LLL : 'D MMMM YYYY [pukul] LT', LLLL : 'dddd, D MMMM YYYY [pukul] LT' }, + meridiemParse: /pagi|siang|sore|malam/, + meridiemHour : function (hour, meridiem) { + if (hour === 12) { + hour = 0; + } + if (meridiem === 'pagi') { + return hour; + } else if (meridiem === 'siang') { + return hour >= 11 ? hour : hour + 12; + } else if (meridiem === 'sore' || meridiem === 'malam') { + return hour + 12; + } + }, meridiem : function (hours, minutes, isLower) { if (hours < 11) { return 'pagi'; diff --git a/js/vendor/momentjs/locale/ja.js b/js/vendor/momentjs/locale/ja.js index 3f55bcfd5..1feb20206 100644 --- a/js/vendor/momentjs/locale/ja.js +++ b/js/vendor/momentjs/locale/ja.js @@ -25,6 +25,10 @@ LLL : 'YYYY年M月D日LT', LLLL : 'YYYY年M月D日LT dddd' }, + meridiemParse: /午前|午後/i, + isPM : function (input) { + return input === '午後'; + }, meridiem : function (hour, minute, isLower) { if (hour < 12) { return '午前'; diff --git a/js/vendor/momentjs/locale/ko.js b/js/vendor/momentjs/locale/ko.js index 956345bde..8f9396f9a 100644 --- a/js/vendor/momentjs/locale/ko.js +++ b/js/vendor/momentjs/locale/ko.js @@ -28,9 +28,6 @@ LLL : 'YYYY년 MMMM D일 LT', LLLL : 'YYYY년 MMMM D일 dddd LT' }, - meridiem : function (hour, minute, isUpper) { - return hour < 12 ? '오전' : '오후'; - }, calendar : { sameDay : '오늘 LT', nextDay : '내일 LT', @@ -57,9 +54,12 @@ }, ordinalParse : /\d{1,2}일/, ordinal : '%d일', - meridiemParse : /(오전|오후)/, + meridiemParse : /오전|오후/, isPM : function (token) { return token === '오후'; + }, + meridiem : function (hour, minute, isUpper) { + return hour < 12 ? '오전' : '오후'; } }); })); diff --git a/js/vendor/momentjs/locale/ml.js b/js/vendor/momentjs/locale/ml.js index 38509141c..eb877bb1a 100644 --- a/js/vendor/momentjs/locale/ml.js +++ b/js/vendor/momentjs/locale/ml.js @@ -48,6 +48,10 @@ y : 'ഒരു വർഷം', yy : '%d വർഷം' }, + meridiemParse: /രാത്രി|രാവിലെ|ഉച്ച കഴിഞ്ഞ്|വൈകുന്നേരം|രാത്രി/i, + isPM : function (input) { + return /^(ഉച്ച കഴിഞ്ഞ്|വൈകുന്നേരം|രാത്രി)$/.test(input); + }, meridiem : function (hour, minute, isLower) { if (hour < 4) { return 'രാത്രി'; diff --git a/js/vendor/momentjs/locale/mr.js b/js/vendor/momentjs/locale/mr.js index 45c200e8c..93f0eea1d 100644 --- a/js/vendor/momentjs/locale/mr.js +++ b/js/vendor/momentjs/locale/mr.js @@ -83,6 +83,21 @@ return symbolMap[match]; }); }, + meridiemParse: /रात्री|सकाळी|दुपारी|सायंकाळी/, + meridiemHour : function (hour, meridiem) { + if (hour === 12) { + hour = 0; + } + if (meridiem === 'रात्री') { + return hour < 4 ? hour : hour + 12; + } else if (meridiem === 'सकाळी') { + return hour; + } else if (meridiem === 'दुपारी') { + return hour >= 10 ? hour : hour + 12; + } else if (meridiem === 'सायंकाळी') { + return hour + 12; + } + }, meridiem: function (hour, minute, isLower) { if (hour < 4) { diff --git a/js/vendor/momentjs/locale/ms-my.js b/js/vendor/momentjs/locale/ms-my.js index 09ec280b7..56d5e9195 100644 --- a/js/vendor/momentjs/locale/ms-my.js +++ b/js/vendor/momentjs/locale/ms-my.js @@ -25,6 +25,19 @@ LLL : 'D MMMM YYYY [pukul] LT', LLLL : 'dddd, D MMMM YYYY [pukul] LT' }, + meridiemParse: /pagi|tengahari|petang|malam/, + meridiemHour: function (hour, meridiem) { + if (hour === 12) { + hour = 0; + } + if (meridiem === 'pagi') { + return hour; + } else if (meridiem === 'tengahari') { + return hour >= 11 ? hour : hour + 12; + } else if (meridiem === 'petang' || meridiem === 'malam') { + return hour + 12; + } + }, meridiem : function (hours, minutes, isLower) { if (hours < 11) { return 'pagi'; diff --git a/js/vendor/momentjs/locale/ne.js b/js/vendor/momentjs/locale/ne.js index ceb283411..eb25ebe20 100644 --- a/js/vendor/momentjs/locale/ne.js +++ b/js/vendor/momentjs/locale/ne.js @@ -60,6 +60,21 @@ return symbolMap[match]; }); }, + meridiemParse: /राती|बिहान|दिउँसो|बेलुका|साँझ|राती/, + meridiemHour : function (hour, meridiem) { + if (hour === 12) { + hour = 0; + } + if (meridiem === 'राती') { + return hour < 3 ? hour : hour + 12; + } else if (meridiem === 'बिहान') { + return hour; + } else if (meridiem === 'दिउँसो') { + return hour >= 10 ? hour : hour + 12; + } else if (meridiem === 'बेलुका' || meridiem === 'साँझ') { + return hour + 12; + } + }, meridiem : function (hour, minute, isLower) { if (hour < 3) { return 'राती'; diff --git a/js/vendor/momentjs/locale/sq.js b/js/vendor/momentjs/locale/sq.js index 415495aa1..9a5bc0989 100644 --- a/js/vendor/momentjs/locale/sq.js +++ b/js/vendor/momentjs/locale/sq.js @@ -19,6 +19,10 @@ weekdays : 'E Diel_E Hënë_E Martë_E Mërkurë_E Enjte_E Premte_E Shtunë'.split('_'), weekdaysShort : 'Die_Hën_Mar_Mër_Enj_Pre_Sht'.split('_'), weekdaysMin : 'D_H_Ma_Më_E_P_Sh'.split('_'), + meridiemParse: /PD|MD/, + isPM: function (input) { + return input.charAt(0) === 'M'; + }, meridiem : function (hours, minutes, isLower) { return hours < 12 ? 'PD' : 'MD'; }, diff --git a/js/vendor/momentjs/locale/ta.js b/js/vendor/momentjs/locale/ta.js index d0356a3ef..8c86b4bfb 100644 --- a/js/vendor/momentjs/locale/ta.js +++ b/js/vendor/momentjs/locale/ta.js @@ -90,20 +90,36 @@ // refer http://ta.wikipedia.org/s/1er1 - + meridiemParse: /யாமம்|வைகறை|காலை|நண்பகல்|எற்பாடு|மாலை/, meridiem : function (hour, minute, isLower) { - if (hour >= 6 && hour <= 10) { - return ' காலை'; - } else if (hour >= 10 && hour <= 14) { - return ' நண்பகல்'; - } else if (hour >= 14 && hour <= 18) { - return ' எற்பாடு'; - } else if (hour >= 18 && hour <= 20) { - return ' மாலை'; - } else if (hour >= 20 && hour <= 24) { - return ' இரவு'; - } else if (hour >= 0 && hour <= 6) { - return ' வைகறை'; + if (hour < 2) { + return ' யாமம்'; + } else if (hour < 6) { + return ' வைகறை'; // வைகறை + } else if (hour < 10) { + return ' காலை'; // காலை + } else if (hour < 14) { + return ' நண்பகல்'; // நண்பகல் + } else if (hour < 18) { + return ' எற்பாடு'; // எற்பாடு + } else if (hour < 22) { + return ' மாலை'; // மாலை + } else { + return ' யாமம்'; + } + }, + meridiemHour : function (hour, meridiem) { + if (hour === 12) { + hour = 0; + } + if (meridiem === 'யாமம்') { + return hour < 2 ? hour : hour + 12; + } else if (meridiem === 'வைகறை' || meridiem === 'காலை') { + return hour; + } else if (meridiem === 'நண்பகல்') { + return hour >= 10 ? hour : hour + 12; + } else { + return hour + 12; } }, week : { diff --git a/js/vendor/momentjs/locale/th.js b/js/vendor/momentjs/locale/th.js index e3c54229e..ec9b840b3 100644 --- a/js/vendor/momentjs/locale/th.js +++ b/js/vendor/momentjs/locale/th.js @@ -25,6 +25,10 @@ LLL : 'D MMMM YYYY เวลา LT', LLLL : 'วันddddที่ D MMMM YYYY เวลา LT' }, + meridiemParse: /ก่อนเที่ยง|หลังเที่ยง/, + isPM: function (input) { + return input === 'หลังเที่ยง'; + }, meridiem : function (hour, minute, isLower) { if (hour < 12) { return 'ก่อนเที่ยง'; diff --git a/js/vendor/momentjs/locale/uk.js b/js/vendor/momentjs/locale/uk.js index 3dce4bcad..84e11ceac 100644 --- a/js/vendor/momentjs/locale/uk.js +++ b/js/vendor/momentjs/locale/uk.js @@ -123,6 +123,10 @@ // M. E.: those two are virtually unused but a user might want to implement them for his/her website for some reason + meridiemParse: /ночі|ранку|дня|вечора/, + isPM: function (input) { + return /^(дня|вечора)$/.test(input); + }, meridiem : function (hour, minute, isLower) { if (hour < 4) { return 'ночі'; 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) { diff --git a/js/vendor/momentjs/locale/zh-tw.js b/js/vendor/momentjs/locale/zh-tw.js index b3c4439c7..75c974d11 100644 --- a/js/vendor/momentjs/locale/zh-tw.js +++ b/js/vendor/momentjs/locale/zh-tw.js @@ -29,6 +29,19 @@ lll : 'YYYY年MMMD日LT', llll : 'YYYY年MMMD日ddddLT' }, + meridiemParse: /早上|上午|中午|下午|晚上/, + meridiemHour : function (hour, meridiem) { + if (hour === 12) { + hour = 0; + } + if (meridiem === '早上' || meridiem === '上午') { + return hour; + } else if (meridiem === '中午') { + return hour >= 11 ? hour : hour + 12; + } else if (meridiem === '下午' || meridiem === '晚上') { + return hour + 12; + } + }, meridiem : function (hour, minute, isLower) { var hm = hour * 100 + minute; if (hm < 900) { -- cgit v1.2.3