From 157a85e8c297927094c93c3841b4ab7cecdc0072 Mon Sep 17 00:00:00 2001 From: Sami Samhuri Date: Thu, 3 Mar 2011 19:16:09 -0800 Subject: [PATCH] use a locale object instead of a l10n function and localize formats --- lib/index.js | 157 +++++++++++++++++++++++++-------------------------- 1 file changed, 76 insertions(+), 81 deletions(-) diff --git a/lib/index.js b/lib/index.js index 93d63df..48b5f9c 100644 --- a/lib/index.js +++ b/lib/index.js @@ -7,97 +7,92 @@ ;(function() { - var strftime = (function() { - var Weekdays = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', - 'Friday', 'Saturday']; + var DefaultLocale = { + days: [ 'Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', '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', - 'August', 'September', 'October', 'November', 'December']; + shortMonths: [ 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', + 'Sep', 'Oct', 'Nov', 'Dec' ], + AM: 'AM', + PM: 'PM' + } - var MonthsShort = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', - 'Sep', 'Oct', 'Nov', 'Dec']; + function pad(n, padding) { + padding = padding || '0'; + return n < 10 ? (padding + n) : n; + } - var AM = 'AM', - PM = 'PM'; + function hours12(d) { + var hour = d.getHours(); + if (hour == 0) hour = 12; + else if (hour > 12) hour -= 12; + return hour; + } - function pad(n, padding) { - padding = padding || '0'; - return n < 10 ? (padding + n) : n; + // 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 + // a function for added flexibility. + function strftime(fmt, d, locale) { + // d and loc are optional, check if d is really loc + if (d && !(d instanceof Date)) { + locale = d; + d = new Date(); } + locale = locale || DefaultLocale; + d = d || new Date(); - function hours12(d) { - var hour = d.getHours(); - if (hour == 0) hour = 12; - else if (hour > 12) hour -= 12; - return hour; - } - - // 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 - // a function for added flexibility. - return function strftime(fmt, d, loc) { - // d and loc are optional, check if d is really loc - if (typeof d === 'function') { - loc = d; - d = new Date(); - } else if (!loc) { - // no localization - loc = function(x) { return x; }; + // Most of the specifiers supported by C's strftime + return fmt.replace(/%(.)/g, function(_, c) { + switch (c) { + case 'A': return locale.days[d.getDay()]; + case 'a': return locale.shortDays[d.getDay()]; + case 'B': return locale.months[d.getMonth()]; + case 'b': // fall through + case 'h': return locale.shortMonths[d.getMonth()]; + case 'D': return strftime(locale.formats.D || '%m/%d/%y', d, locale); + case 'd': return pad(d.getDate()); + case 'e': return d.getDate(); + case 'F': return strftime(locale.formats.F || '%Y-%m-%d', d, locale); + case 'H': return pad(d.getHours()); + case 'I': return pad(hours12(d)); + case 'k': return pad(d.getHours(), ' '); + case 'l': return pad(hours12(d), ' '); + case 'M': return pad(d.getMinutes()); + case 'm': return pad(d.getMonth() + 1); + case 'n': return '\n'; + case 'p': return d.getHours() < 12 ? locale.AM : locale.PM; + case 'R': return strftime(locale.formats.R || '%H:%M', d, locale); + case 'r': return strftime(locale.formats.r || '%I:%M:%S %p', d, locale); + case 'S': return pad(d.getSeconds()); + case 's': return d.getTime(); + case 'T': return strftime(locale.formats.T || '%H:%M:%S', d, locale); + case 't': return '\t'; + case 'u': + var day = d.getDay(); + return day == 0 ? 7 : day; // 1 - 7, Monday is first day of the week + 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 'Y': return d.getFullYear(); + case 'y': + var year = d.getYear(); + return year < 100 ? year : year - 100; + case 'Z': + var tz = d.toString().match(/\((\w+)\)/); + return tz && tz[1] || ''; + case 'z': + var off = d.getTimezoneOffset(); + return (off < 0 ? '-' : '+') + pad(off / 60) + pad(off % 60); + default: return c; } - d = d || new Date(); + }); + } - // Most of the specifiers supported by C's strftime - return fmt.replace(/%(.)/g, function(_, c) { - switch (c) { - case 'A': return loc(Weekdays[d.getDay()]); - case 'a': return loc(WeekdaysShort[d.getDay()]); - case 'B': return loc(Months[d.getMonth()]); - case 'b': // fall through - case 'h': return loc(MonthsShort[d.getMonth()]); - case 'D': return strftime('%m/%d/%y', d, loc); - case 'd': return pad(d.getDate()); - case 'e': return d.getDate(); - case 'F': return strftime('%Y-%m-%d', d, loc); - case 'H': return pad(d.getHours()); - case 'I': return pad(hours12(d)); - case 'k': return pad(d.getHours(), ' '); - case 'l': return pad(hours12(d), ' '); - case 'M': return pad(d.getMinutes()); - case 'm': return pad(d.getMonth() + 1); - case 'n': return '\n'; - case 'p': return d.getHours() < 12 ? loc(AM) : loc(PM); - case 'R': return strftime('%H:%M', d, loc); - case 'r': return strftime('%I:%M:%S %p', d, loc); - case 'S': return pad(d.getSeconds()); - case 's': return d.getTime(); - case 'T': return strftime('%H:%M:%S', d, loc); - case 't': return '\t'; - case 'u': - var day = d.getDay(); - return day == 0 ? 7 : day; // 1 - 7, Monday is first day of the week - case 'v': return strftime('%e-%b-%Y', d, loc); - case 'w': return d.getDay(); // 0 - 6, Sunday is first day of the week - case 'Y': return d.getFullYear(); - case 'y': - var year = d.getYear(); - return year < 100 ? year : year - 100; - case 'Z': - var tz = d.toString().match(/\((\w+)\)/); - return tz && tz[1] || ''; - case 'z': - var off = d.getTimezoneOffset(); - return (off < 0 ? '-' : '+') + pad(off / 60) + pad(off % 60); - default: return c; - } - }); - }; - }()); - - function getLocalizedStrftime(loc) { + function getLocalizedStrftime(locale) { return function(fmt, d) { - return strftime(fmt, d, loc); + return strftime(fmt, d, locale); }; }