Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

timerender: Make get_full_time produce a ISO 8601 date string. 

Having get_full_time produce a date string non-compliant with RFC2822 or
ISO 8601 caused problems when showing edition timestamps on a message's
edit history.

Now it returns an ISO 8601 date string (1978-10-31T13:37:42Z).
This commit is contained in:
Yago González 2017-06-21 21:37:53 +02:00 committed by showell
parent 45f27cd058
commit e7bd18ec09
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend_tests/node_tests/timerender.js
View File

@ -129,7 +129,7 @@ var timerender = require('js/timerender.js');
(function test_get_full_time() {
var timestamp = 1495091573; // 5/18/2017 7:12:53 AM (UTC+0)
var expected = '5/18/2017 7:12:53 AM (UTC+0)';
var expected = '2017-05-18T07:12:53Z'; // ISO 8601 date format
var actual = timerender.get_full_time(timestamp);
assert.equal(expected, actual);
}());

15
static/js/timerender.js
View File

@ -202,19 +202,10 @@ exports.update_timestamps = function () {
setInterval(exports.update_timestamps, 60 * 1000);
// TODO: Remove the duplication with the below; it's a bit tricky
// because the return type models are pretty different.
// Transform a Unix timestamp into a ISO 8601 formatted date string.
// Example: 1978-10-31T13:37:42Z
exports.get_full_time = function (timestamp) {
var time = new XDate(timestamp * 1000);
// Convert to number of hours ahead/behind UTC.
// The sign of getTimezoneOffset() is reversed wrt
// the conventional meaning of UTC+n / UTC-n
var tz_offset = -time.getTimezoneOffset() / 60;
var full_date_str = time.toLocaleDateString();
var full_time_str = time.toLocaleTimeString() +
' (UTC' + ((tz_offset < 0) ? '' : '+') + tz_offset + ')';
return full_date_str + ' ' + full_time_str;
return new XDate(timestamp * 1000).toISOString();
};