[MERGE] forward port of branch saas-6 up to 48639d4

This commit is contained in:
Christophe Simonis
2016-01-27 12:10:29 +01:00
25 changed files with 107 additions and 8 deletions
@@ -17,6 +17,10 @@
weekdays : "Sondag_Maandag_Dinsdag_Woensdag_Donderdag_Vrydag_Saterdag".split("_"), weekdays : "Sondag_Maandag_Dinsdag_Woensdag_Donderdag_Vrydag_Saterdag".split("_"),
weekdaysShort : "Son_Maa_Din_Woe_Don_Vry_Sat".split("_"), weekdaysShort : "Son_Maa_Din_Woe_Don_Vry_Sat".split("_"),
weekdaysMin : "So_Ma_Di_Wo_Do_Vr_Sa".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) { meridiem : function (hours, minutes, isLower) {
if (hours < 12) { if (hours < 12) {
return isLower ? 'vm' : 'VM'; return isLower ? 'vm' : 'VM';
+5 -1
View File
@@ -48,6 +48,10 @@
LLL : "D MMMM YYYY LT", LLL : "D MMMM YYYY LT",
LLLL : "dddd D MMMM YYYY LT" LLLL : "dddd D MMMM YYYY LT"
}, },
meridiemParse: /ص|م/,
isPM : function (input) {
return 'م' === input;
},
meridiem : function (hour, minute, isLower) { meridiem : function (hour, minute, isLower) {
if (hour < 12) { if (hour < 12) {
return "ص"; return "ص";
@@ -79,7 +83,7 @@
yy : "%d سنوات" yy : "%d سنوات"
}, },
preparse: function (string) { preparse: function (string) {
return string.replace(/[۰-۹]/g, function (match) { return string.replace(/[١٢٣٤٥٦٧٨٩٠]/g, function (match) {
return numberMap[match]; return numberMap[match];
}).replace(/،/g, ','); }).replace(/،/g, ',');
}, },
+5 -1
View File
@@ -49,6 +49,10 @@
LLL : "D MMMM YYYY LT", LLL : "D MMMM YYYY LT",
LLLL : "dddd D MMMM YYYY LT" LLLL : "dddd D MMMM YYYY LT"
}, },
meridiemParse: /ص|م/,
isPM : function (input) {
return 'م' === input;
},
meridiem : function (hour, minute, isLower) { meridiem : function (hour, minute, isLower) {
if (hour < 12) { if (hour < 12) {
return "ص"; return "ص";
@@ -80,7 +84,7 @@
yy : "%d سنوات" yy : "%d سنوات"
}, },
preparse: function (string) { preparse: function (string) {
return string.replace(/[۰-۹]/g, function (match) { return string.replace(/[١٢٣٤٥٦٧٨٩٠]/g, function (match) {
return numberMap[match]; return numberMap[match];
}).replace(/،/g, ','); }).replace(/،/g, ',');
}, },
@@ -72,6 +72,10 @@
y : "bir il", y : "bir il",
yy : "%d 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) { meridiem : function (hour, minute, isLower) {
if (hour < 4) { if (hour < 4) {
return "gecə"; return "gecə";
+4 -2
View File
@@ -113,8 +113,10 @@
y : "год", y : "год",
yy : relativeTimeWithPlural yy : relativeTimeWithPlural
}, },
meridiemParse: /ночы|раніцы|дня|вечара/,
isPM : function (input) {
return /^(дня|вечара)$/.test(input);
},
meridiem : function (hour, minute, isLower) { meridiem : function (hour, minute, isLower) {
if (hour < 4) { if (hour < 4) {
return "ночы"; return "ночы";
@@ -82,6 +82,10 @@
return symbolMap[match]; return symbolMap[match];
}); });
}, },
meridiemParse: /রাত|শকাল|দুপুর|বিকেল|রাত/,
isPM: function (input) {
return /^(দুপুর|বিকেল|রাত)$/.test(input);
},
//Bengali is a vast language its spoken //Bengali is a vast language its spoken
//in different forms in various parts of the world. //in different forms in various parts of the world.
//I have just generalized with most common one used //I have just generalized with most common one used
@@ -82,6 +82,10 @@
return symbolMap[match]; return symbolMap[match];
}); });
}, },
meridiemParse: /མཚན་མོ|ཞོགས་ཀས|ཉིན་གུང|དགོང་དག|མཚན་མོ/,
isPM: function (input) {
return /^(ཉིན་གུང|དགོང་དག|མཚན་མོ)$/.test(input);
},
meridiem : function (hour, minute, isLower) { meridiem : function (hour, minute, isLower) {
if (hour < 4) { if (hour < 4) {
return "མཚན་མོ"; return "མཚན་མོ";
@@ -26,6 +26,10 @@
LLL : "D[-an de] MMMM, YYYY LT", LLL : "D[-an de] MMMM, YYYY LT",
LLLL : "dddd, [la] 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) { meridiem : function (hours, minutes, isLower) {
if (hours > 11) { if (hours > 11) {
return isLower ? 'p.t.m.' : 'P.T.M.'; return isLower ? 'p.t.m.' : 'P.T.M.';
@@ -48,6 +48,10 @@
LLL : 'D MMMM YYYY LT', LLL : 'D MMMM YYYY LT',
LLLL : 'dddd, D MMMM YYYY LT' LLLL : 'dddd, D MMMM YYYY LT'
}, },
meridiemParse: /قبل از ظهر|بعد از ظهر/,
isPM: function (input) {
return /بعد از ظهر/.test(input);
},
meridiem : function (hour, minute, isLower) { meridiem : function (hour, minute, isLower) {
if (hour < 12) { if (hour < 12) {
return "قبل از ظهر"; return "قبل از ظهر";
@@ -84,6 +84,11 @@
}, },
// Hindi notation for meridiems are quite fuzzy in practice. While there exists // 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. // a rigid notion of a 'Pahar' it is not used as rigidly in modern Hindi.
meridiemParse: /रात|सुबह|दोपहर|शाम|रात/,
isPM: function (input) {
// TODO: This is incorrect (look at cutoffs). We need a better isPM interface.
return /^(दोपहर|शाम|रात)$/.test(input);
},
meridiem : function (hour, minute, isLower) { meridiem : function (hour, minute, isLower) {
if (hour < 4) { if (hour < 4) {
return "रात"; return "रात";
@@ -62,6 +62,10 @@
LLL : "YYYY. MMMM D., LT", LLL : "YYYY. MMMM D., LT",
LLLL : "YYYY. MMMM D., dddd 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) { meridiem : function (hours, minutes, isLower) {
if (hours < 12) { if (hours < 12) {
return isLower === true ? 'de' : 'DE'; return isLower === true ? 'de' : 'DE';
@@ -77,6 +77,10 @@
yy : "%d տարի" yy : "%d տարի"
}, },
meridiemParse: /գիշերվա|առավոտվա|ցերեկվա|երեկոյան/,
isPM: function (input) {
return /^(ցերեկվա|երեկոյան)$/.test(input);
},
meridiem : function (hour) { meridiem : function (hour) {
if (hour < 4) { if (hour < 4) {
return "գիշերվա"; return "գիշերվա";
@@ -25,6 +25,11 @@
LLL : "D MMMM YYYY [pukul] LT", LLL : "D MMMM YYYY [pukul] LT",
LLLL : "dddd, D MMMM YYYY [pukul] LT" LLLL : "dddd, D MMMM YYYY [pukul] LT"
}, },
meridiemParse: /pagi|siang|sore|malam/,
isPM: function (input) {
// TODO: This is incorrect (look at cutoffs).
return /^(siang|sore|malam)$/.test(input);
},
meridiem : function (hours, minutes, isLower) { meridiem : function (hours, minutes, isLower) {
if (hours < 11) { if (hours < 11) {
return 'pagi'; return 'pagi';
@@ -24,6 +24,10 @@
LLL : "YYYY年M月D日LT", LLL : "YYYY年M月D日LT",
LLLL : "YYYY年M月D日LT dddd" LLLL : "YYYY年M月D日LT dddd"
}, },
meridiemParse: /午前|午後/i,
isPM : function (input) {
return input === '午後';
},
meridiem : function (hour, minute, isLower) { meridiem : function (hour, minute, isLower) {
if (hour < 12) { if (hour < 12) {
return "午前"; return "午前";
+4 -4
View File
@@ -27,9 +27,6 @@
LLL : "YYYY년 MMMM D일 LT", LLL : "YYYY년 MMMM D일 LT",
LLLL : "YYYY년 MMMM D일 dddd LT" LLLL : "YYYY년 MMMM D일 dddd LT"
}, },
meridiem : function (hour, minute, isUpper) {
return hour < 12 ? '오전' : '오후';
},
calendar : { calendar : {
sameDay : '오늘 LT', sameDay : '오늘 LT',
nextDay : '내일 LT', nextDay : '내일 LT',
@@ -55,9 +52,12 @@
yy : "%d년" yy : "%d년"
}, },
ordinal : '%d일', ordinal : '%d일',
meridiemParse : /(오전|오후)/, meridiemParse : /오전|오후/,
isPM : function (token) { isPM : function (token) {
return token === "오후"; return token === "오후";
},
meridiem : function (hour, minute, isUpper) {
return hour < 12 ? '오전' : '오후';
} }
}); });
})); }));
@@ -47,6 +47,10 @@
y : "ഒരു വർഷം", y : "ഒരു വർഷം",
yy : "%d വർഷം" yy : "%d വർഷം"
}, },
meridiemParse: /രാത്രി|രാവിലെ|ഉച്ച കഴിഞ്ഞ്|വൈകുന്നേരം|രാത്രി/i,
isPM : function (input) {
return /^(ഉച്ച കഴിഞ്ഞ്|വൈകുന്നേരം|രാത്രി)$/.test(input);
},
meridiem : function (hour, minute, isLower) { meridiem : function (hour, minute, isLower) {
if (hour < 4) { if (hour < 4) {
return "രാത്രി"; return "രാത്രി";
@@ -82,6 +82,11 @@
return symbolMap[match]; return symbolMap[match];
}); });
}, },
meridiemParse: /रात्री|सकाळी|दुपारी|सायंकाळी|रात्री/,
isPM : function (input) {
// TODO: This is wrong.
return /^(दुपारी|सायंकाळी|रात्री)$/.test(input);
},
meridiem: function (hour, minute, isLower) meridiem: function (hour, minute, isLower)
{ {
if (hour < 4) { if (hour < 4) {
@@ -24,6 +24,11 @@
LLL : "D MMMM YYYY [pukul] LT", LLL : "D MMMM YYYY [pukul] LT",
LLLL : "dddd, D MMMM YYYY [pukul] LT" LLLL : "dddd, D MMMM YYYY [pukul] LT"
}, },
meridiemParse: /pagi|tengahari|petang|malam/,
isPM: function (input) {
// TODO: This is wrong.
return /^(tengahari|petang|malam)$/.test(input);
},
meridiem : function (hours, minutes, isLower) { meridiem : function (hours, minutes, isLower) {
if (hours < 11) { if (hours < 11) {
return 'pagi'; return 'pagi';
@@ -59,6 +59,11 @@
return symbolMap[match]; return symbolMap[match];
}); });
}, },
meridiemParse: /राती|बिहान|दिउँसो|बेलुका|साँझ|राती/,
isPM : function (input) {
// TODO: This is wrong.
return /^(दिउँसो|बेलुका|साँझ|राती)$/.test(input);
},
meridiem : function (hour, minute, isLower) { meridiem : function (hour, minute, isLower) {
if (hour < 3) { if (hour < 3) {
return "राती"; return "राती";
@@ -19,6 +19,10 @@
weekdays : "E Diel_E Hënë_E Martë_E Mërkurë_E Enjte_E Premte_E Shtunë".split("_"), 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("_"), weekdaysShort : "Die_Hën_Mar_Mër_Enj_Pre_Sht".split("_"),
weekdaysMin : "D_H_Ma_Më_E_P_Sh".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) { meridiem : function (hours, minutes, isLower) {
return hours < 12 ? 'PD' : 'MD'; return hours < 12 ? 'PD' : 'MD';
}, },
@@ -89,6 +89,8 @@
// refer http://ta.wikipedia.org/s/1er1 // refer http://ta.wikipedia.org/s/1er1
// TODO: This is pretty wrong (when hour is equal to 6 10, 14, 18, 20,
// 24 (0). Also it doesn't split at 12 (noon).
meridiem : function (hour, minute, isLower) { meridiem : function (hour, minute, isLower) {
if (hour >= 6 && hour <= 10) { if (hour >= 6 && hour <= 10) {
return " காலை"; return " காலை";
@@ -24,6 +24,10 @@
LLL : "D MMMM YYYY เวลา LT", LLL : "D MMMM YYYY เวลา LT",
LLLL : "วันddddที่ D MMMM YYYY เวลา LT" LLLL : "วันddddที่ D MMMM YYYY เวลา LT"
}, },
meridiemParse: /ก่อนเที่ยง|หลังเที่ยง/,
isPM: function (input) {
return input === 'หลังเที่ยง';
},
meridiem : function (hour, minute, isLower) { meridiem : function (hour, minute, isLower) {
if (hour < 12) { if (hour < 12) {
return "ก่อนเที่ยง"; return "ก่อนเที่ยง";
@@ -122,6 +122,10 @@
// M. E.: those two are virtually unused but a user might want to implement them for his/her website for some reason // 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) { meridiem : function (hour, minute, isLower) {
if (hour < 4) { if (hour < 4) {
return "ночі"; return "ночі";
@@ -29,6 +29,11 @@
lll : "YYYY年MMMD日LT", lll : "YYYY年MMMD日LT",
llll : "YYYY年MMMD日ddddLT" llll : "YYYY年MMMD日ddddLT"
}, },
meridiemParse: /凌晨|早上|上午|中午|下午|晚上/,
isPM: function (input) {
// TODO: This is wrong.
return /^(中午|下午|晚上)$/.test(input);
},
meridiem : function (hour, minute, isLower) { meridiem : function (hour, minute, isLower) {
var hm = hour * 100 + minute; var hm = hour * 100 + minute;
if (hm < 600) { if (hm < 600) {
@@ -28,6 +28,11 @@
lll : "YYYY年MMMD日LT", lll : "YYYY年MMMD日LT",
llll : "YYYY年MMMD日ddddLT" llll : "YYYY年MMMD日ddddLT"
}, },
meridiemParse: /早上|上午|中午|下午|晚上/,
isPM: function (input) {
// TODO: This is wrong.
return /^(中午|下午|晚上)$/.test(input);
},
meridiem : function (hour, minute, isLower) { meridiem : function (hour, minute, isLower) {
var hm = hour * 100 + minute; var hm = hour * 100 + minute;
if (hm < 900) { if (hm < 900) {