sjs/strftime
1
0
Fork 0
mirror of https://github.com/samsonjs/strftime.git synced 2026-04-14 12:15:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #40 from alexandrnikitin/Issue39_BugInPartialHourTimezone

Browse source 
Fix for #39 bug in partial hour timezones
This commit is contained in:
Sami Samhuri 2014-06-17 11:16:41 -07:00
commit 50a267bf23
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
strftime.js
View file

@ -103,7 +103,7 @@
var sign = tz[0] == '-' ? -1 : 1; var sign = tz[0] == '-' ? -1 : 1;
var hours = parseInt(tz.slice(1, 3), 10); var hours = parseInt(tz.slice(1, 3), 10);
var mins = parseInt(tz.slice(3, 5), 10); var mins = parseInt(tz.slice(3, 5), 10);
tz = sign * (60 * hours) + mins; tz = sign * ((60 * hours) + mins);
} }
if (tzType) { if (tzType) {
@ -271,7 +271,7 @@
} }
else { else {
var off = typeof tz == 'number' ? tz : -d.getTimezoneOffset(); var off = typeof tz == 'number' ? tz : -d.getTimezoneOffset();
return (off < 0 ? '-' : '+') + pad(Math.abs(off / 60)) + pad(off % 60); return (off < 0 ? '-' : '+') + pad(Math.floor(Math.abs(off) / 60)) + pad(Math.abs(off) % 60);
} }
default: return c; default: return c;

1
test/test.js
View file

@ -173,6 +173,7 @@ assert.formatTZ('%F %r %z', '2011-06-07 08:51:45 PM +0200', 120)
assert.formatTZ('%F %r %z', '2011-06-07 08:51:45 PM +0200', '+0200') assert.formatTZ('%F %r %z', '2011-06-07 08:51:45 PM +0200', '+0200')
assert.formatTZ('%F %r %z', '2011-06-07 11:51:45 AM -0700', -420) assert.formatTZ('%F %r %z', '2011-06-07 11:51:45 AM -0700', -420)
assert.formatTZ('%F %r %z', '2011-06-07 11:51:45 AM -0700', '-0700') assert.formatTZ('%F %r %z', '2011-06-07 11:51:45 AM -0700', '-0700')
assert.formatTZ('%F %r %z', '2011-06-07 11:21:45 AM -0730', '-0730')
ok('Time zone offset') ok('Time zone offset')