use a locale object instead of a l10n function and localize formats

This commit is contained in:
Sami Samhuri 2011-03-03 19:16:09 -08:00
parent 3ed3282d23
commit 157a85e8c2

View file

@ -7,20 +7,18 @@
;(function() { ;(function() {
var strftime = (function() { var DefaultLocale = {
var Weekdays = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', days: [ 'Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday' ],
'Friday', 'Saturday']; shortDays: [ 'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat' ],
var WeekdaysShort = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat']; months: [ 'January', 'February', 'March', 'April', 'May', 'June', 'July',
'August', 'September', 'October', 'November', 'December' ],
var Months = ['January', 'February', 'March', 'April', 'May', 'June', 'July', shortMonths: [ 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug',
'August', 'September', 'October', 'November', 'December']; 'Sep', 'Oct', 'Nov', 'Dec' ],
AM: 'AM',
var MonthsShort = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', PM: 'PM'
'Sep', 'Oct', 'Nov', 'Dec']; }
var AM = 'AM',
PM = 'PM';
function pad(n, padding) { function pad(n, padding) {
padding = padding || '0'; padding = padding || '0';
@ -37,29 +35,27 @@
// loc is a function that maps the default English names to localized // loc is a function that maps the default English names to localized
// names. In most cases it will just look up strings in a map but it's // names. In most cases it will just look up strings in a map but it's
// a function for added flexibility. // a function for added flexibility.
return function strftime(fmt, d, loc) { function strftime(fmt, d, locale) {
// d and loc are optional, check if d is really loc // d and loc are optional, check if d is really loc
if (typeof d === 'function') { if (d && !(d instanceof Date)) {
loc = d; locale = d;
d = new Date(); d = new Date();
} else if (!loc) {
// no localization
loc = function(x) { return x; };
} }
locale = locale || DefaultLocale;
d = d || new Date(); d = d || new Date();
// Most of the specifiers supported by C's strftime // Most of the specifiers supported by C's strftime
return fmt.replace(/%(.)/g, function(_, c) { return fmt.replace(/%(.)/g, function(_, c) {
switch (c) { switch (c) {
case 'A': return loc(Weekdays[d.getDay()]); case 'A': return locale.days[d.getDay()];
case 'a': return loc(WeekdaysShort[d.getDay()]); case 'a': return locale.shortDays[d.getDay()];
case 'B': return loc(Months[d.getMonth()]); case 'B': return locale.months[d.getMonth()];
case 'b': // fall through case 'b': // fall through
case 'h': return loc(MonthsShort[d.getMonth()]); case 'h': return locale.shortMonths[d.getMonth()];
case 'D': return strftime('%m/%d/%y', d, loc); case 'D': return strftime(locale.formats.D || '%m/%d/%y', d, locale);
case 'd': return pad(d.getDate()); case 'd': return pad(d.getDate());
case 'e': return d.getDate(); case 'e': return d.getDate();
case 'F': return strftime('%Y-%m-%d', d, loc); case 'F': return strftime(locale.formats.F || '%Y-%m-%d', d, locale);
case 'H': return pad(d.getHours()); case 'H': return pad(d.getHours());
case 'I': return pad(hours12(d)); case 'I': return pad(hours12(d));
case 'k': return pad(d.getHours(), ' '); case 'k': return pad(d.getHours(), ' ');
@ -67,17 +63,17 @@
case 'M': return pad(d.getMinutes()); case 'M': return pad(d.getMinutes());
case 'm': return pad(d.getMonth() + 1); case 'm': return pad(d.getMonth() + 1);
case 'n': return '\n'; case 'n': return '\n';
case 'p': return d.getHours() < 12 ? loc(AM) : loc(PM); case 'p': return d.getHours() < 12 ? locale.AM : locale.PM;
case 'R': return strftime('%H:%M', d, loc); case 'R': return strftime(locale.formats.R || '%H:%M', d, locale);
case 'r': return strftime('%I:%M:%S %p', d, loc); case 'r': return strftime(locale.formats.r || '%I:%M:%S %p', d, locale);
case 'S': return pad(d.getSeconds()); case 'S': return pad(d.getSeconds());
case 's': return d.getTime(); case 's': return d.getTime();
case 'T': return strftime('%H:%M:%S', d, loc); case 'T': return strftime(locale.formats.T || '%H:%M:%S', d, locale);
case 't': return '\t'; case 't': return '\t';
case 'u': case 'u':
var day = d.getDay(); var day = d.getDay();
return day == 0 ? 7 : day; // 1 - 7, Monday is first day of the week return day == 0 ? 7 : day; // 1 - 7, Monday is first day of the week
case 'v': return strftime('%e-%b-%Y', d, loc); case 'v': return strftime(locale.formats.v || '%e-%b-%Y', d, locale);
case 'w': return d.getDay(); // 0 - 6, Sunday is first day of the week case 'w': return d.getDay(); // 0 - 6, Sunday is first day of the week
case 'Y': return d.getFullYear(); case 'Y': return d.getFullYear();
case 'y': case 'y':
@ -92,12 +88,11 @@
default: return c; default: return c;
} }
}); });
}; }
}());
function getLocalizedStrftime(loc) { function getLocalizedStrftime(locale) {
return function(fmt, d) { return function(fmt, d) {
return strftime(fmt, d, loc); return strftime(fmt, d, locale);
}; };
} }