Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Commit 8c46919

Browse files
committed
fix(filter): format timezone correctly
This fixes timezone formatting in case UTC timezone is used Closes #9359
1 parent d729fcf commit 8c46919

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

src/ng/filter/filters.js

+5-3
Original file line numberDiff line numberDiff line change
@@ -260,8 +260,8 @@ function dateStrGetter(name, shortForm) {
260260
};
261261
}
262262

263-
function timeZoneGetter(date) {
264-
var zone = -1 * date.getTimezoneOffset();
263+
function timeZoneGetter(date, formats, offset) {
264+
var zone = -1 * offset;
265265
var paddedZone = (zone >= 0) ? "+" : "";
266266

267267
paddedZone += padNumber(Math[zone > 0 ? 'floor' : 'ceil'](zone / 60), 2) +
@@ -482,13 +482,15 @@ function dateFilter($locale) {
482482
}
483483
}
484484

485+
var dateTimezoneOffset = date.getTimezoneOffset();
485486
if (timezone && timezone === 'UTC') {
486487
date = new Date(date.getTime());
487488
date.setMinutes(date.getMinutes() + date.getTimezoneOffset());
489+
dateTimezoneOffset = 0;
488490
}
489491
forEach(parts, function(value) {
490492
fn = DATE_FORMATS[value];
491-
text += fn ? fn(date, $locale.DATETIME_FORMATS)
493+
text += fn ? fn(date, $locale.DATETIME_FORMATS, dateTimezoneOffset)
492494
: value.replace(/(^'|'$)/g, '').replace(/''/g, "'");
493495
});
494496

test/ng/filter/filtersSpec.js

+1
Original file line numberDiff line numberDiff line change
@@ -456,6 +456,7 @@ describe('filters', function() {
456456
it('should use UTC if the timezone is set to "UTC"', function() {
457457
expect(date(new Date(2003, 8, 10, 3, 2, 4), 'yyyy-MM-dd HH-mm-ss')).toEqual('2003-09-10 03-02-04');
458458
expect(date(new Date(Date.UTC(2003, 8, 10, 3, 2, 4)), 'yyyy-MM-dd HH-mm-ss', 'UTC')).toEqual('2003-09-10 03-02-04');
459+
expect(date(new Date(Date.UTC(2003, 8, 10, 3, 2, 4)), 'yyyy-MM-dd HH-mm-ssZ', 'UTC')).toEqual('2003-09-10 03-02-04+0000');
459460
});
460461
});
461462
});

0 commit comments

Comments
 (0)