github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-22 00:55:25 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Topic entrace considered the same day of a different month as today.

Browse Source
This commit is contained in:
Robin Ward 2014-08-18 17:40:50 -04:00
parent 14c765ef11
commit 68fca9398d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/javascripts/discourse/controllers/topic-entrance.js.es6
View File

@ -1,18 +1,18 @@
function entranceDate(bumpedAt, showTime) { function entranceDate(dt, showTime) {
var today = new Date(); var today = new Date();
if (bumpedAt.getDate() === today.getDate()) { if (dt.toDateString() === today.toDateString()) {
return moment(bumpedAt).format(I18n.t("dates.time")); return moment(dt).format(I18n.t("dates.time"));
} }
if (bumpedAt.getYear() === today.getYear()) { if (dt.getYear() === today.getYear()) {
// No year // No year
return moment(bumpedAt).format( return moment(dt).format(
showTime ? I18n.t("dates.long_no_year") : I18n.t("dates.long_no_year_no_time") showTime ? I18n.t("dates.long_no_year") : I18n.t("dates.long_no_year_no_time")
); );
} }
return moment(bumpedAt).format( return moment(dt).format(
showTime ? I18n.t('dates.long_with_year') : I18n.t('dates.long_with_year_no_time') showTime ? I18n.t('dates.long_with_year') : I18n.t('dates.long_with_year_no_time')
); );
} }