fix localized am/pm

This commit is contained in:
James Campos 2011-05-21 23:14:07 -07:00
parent c2d993adcd
commit 5eed80ae7d
2 changed files with 12 additions and 10 deletions

View File

@ -1651,16 +1651,17 @@
year = "20" + year;
month -= 1;
hour = g.chanOffset + Number(hour);
date = new Date(year, month, day, hour);
year = date.getFullYear() - 2000;
month = $.zeroPad(date.getMonth() + 1);
day = $.zeroPad(date.getDate());
hour = date.getHours();
meridiem = '';
if ($.config('Localized am/pm')) {
meridiem = hour < 12 ? ' a.m.' : ' p.m.';
hour = hour % 12 || 12;
}
date = new Date(year, month, day, hour);
year = date.getFullYear() - 2000;
month = $.zeroPad(date.getMonth() + 1);
day = $.zeroPad(date.getDate());
hour = $.zeroPad(date.getHours());
hour = $.zeroPad(hour);
dotw = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'][date.getDay()];
_results.push(s.textContent = " " + month + "/" + day + "/" + year + "(" + dotw + ")" + hour + ":" + min_sec + meridiem + " ");
}

View File

@ -1330,15 +1330,16 @@ localize =
year = "20#{year}"
month -= 1 #months start at 0
hour = g.chanOffset + Number hour
meridiem = ''
if $.config 'Localized am/pm'
meridiem = if hour < 12 then ' a.m.' else ' p.m.'
hour = hour % 12 or 12
date = new Date year, month, day, hour
year = date.getFullYear() - 2000
month = $.zeroPad date.getMonth() + 1
day = $.zeroPad date.getDate()
hour = $.zeroPad date.getHours()
hour = date.getHours()
meridiem = ''
if $.config 'Localized am/pm'
meridiem = if hour < 12 then ' a.m.' else ' p.m.'
hour = hour % 12 or 12
hour = $.zeroPad hour
dotw = [
'Sun'
'Mon'