Mirrors/thelounge
2
0
Fork 0
mirror of https://github.com/thelounge/thelounge synced 2024-11-26 14:00:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1114 from thelounge/xpaw/moment

Browse source 
Use moment to render dates everywhere
This commit is contained in:
Pavel Djundik 2017-05-06 13:43:02 +03:00 committed by GitHub
commit fe77563cdb
6 changed files with 14 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
client/js/libs/handlebars/friendlydate.js
View file

@ -4,10 +4,10 @@ const moment = require("moment");
module.exports = function(time) {
// See http://momentjs.com/docs/#/displaying/calendar-time/
return moment(new Date(time)).calendar(null, {
return moment(time).calendar(null, {
sameDay: "[Today]",
lastDay: "[Yesterday]",
lastWeek: "L", // Locale
sameElse: "L"
lastWeek: "D MMMM YYYY",
sameElse: "D MMMM YYYY"
});
};

4
client/js/libs/handlebars/localedate.js
View file

@ -1,5 +1,7 @@
"use strict";
const moment = require("moment");
module.exports = function(time) {
return new Date(time).toLocaleDateString();
return moment(time).format("D MMMM YYYY");
};

4
client/js/libs/handlebars/localetime.js
View file

@ -1,5 +1,7 @@
"use strict";
const moment = require("moment");
module.exports = function(time) {
return new Date(time).toLocaleString();
return moment(time).format("D MMMM YYYY, HH:mm:ss");
};

16
client/js/libs/handlebars/tz.js
View file

@ -1,17 +1,7 @@
"use strict";
const moment = require("moment");
module.exports = function(time) {
time = new Date(time);
var h = time.getHours();
var m = time.getMinutes();
if (h < 10) {
h = "0" + h;
}
if (m < 10) {
m = "0" + m;
}
return h + ":" + m;
return moment(time).format("HH:mm");
};

2
test/client/js/libs/handlebars/friendlydateTest.js
View file

@ -18,7 +18,7 @@ describe("friendlydate Handlebars helper", () => {
it("should not render any friendly dates prior to the day before", () => {
[2, 7, 30, 365, 1000].forEach(day => {
const time = new Date().getTime() - 24 * 3600 * 1000 * day;
expect(friendlydate(time)).to.equal(moment(time).format("L"));
expect(friendlydate(time)).to.equal(moment(time).format("D MMMM YYYY"));
});
});
});

2
test/client/js/libs/handlebars/localetimeTest.js
View file

@ -14,6 +14,6 @@ describe("localetime Handlebars helper", () => {
// Pretend local timezone is UTC by moving the clock of that offset
const time = date.getTime() + offset;
expect(localetime(time)).to.equal("5/22/2014, 12:00:00 PM");
expect(localetime(time)).to.equal("22 May 2014, 12:00:00");
});
});