IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Error in smart short date function

Browse Source
This commit is contained in:
Robin Ward 2016-05-20 16:06:37 -04:00
parent 1643ff0f3c
commit 90330d30f4
No known key found for this signature in database
GPG Key ID: 0E091E2B4ED1B83D
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/discourse/lib/formatter.js.es6
View File

@ -56,8 +56,8 @@ function shortDateNoYear(date) {
} }
// Suppress year if it's this year // Suppress year if it's this year
export function smartShortDate(date) { export function smartShortDate(date, withYear=tinyDateYear) {
return (date.getFullYear() === new Date().getFullYear()) ? shortDateNoYear(date) : tinyDateYear(date); return (date.getFullYear() === new Date().getFullYear()) ? shortDateNoYear(date) : withYear(date);
} }
export function tinyDateYear(date) { export function tinyDateYear(date) {
@ -220,7 +220,7 @@ function relativeAgeMedium(date, options) {
if (distance < oneMinuteAgo) { if (distance < oneMinuteAgo) {
displayDate = I18n.t("now"); displayDate = I18n.t("now");
} else if (distance > fiveDaysAgo) { } else if (distance > fiveDaysAgo) {
displayDate = smartShortDate(date); displayDate = smartShortDate(date, shortDate);
} else { } else {
displayDate = relativeAgeMediumSpan(distance, leaveAgo); displayDate = relativeAgeMediumSpan(distance, leaveAgo);
} }

1
test/javascripts/lib/formatter-test.js.es6
View File

@ -80,7 +80,6 @@ test("formating medium length dates", function() {
equal(strip(formatDays(8)), shortDate(8)); equal(strip(formatDays(8)), shortDate(8));
equal(strip(formatDays(10)), shortDateYear(10)); equal(strip(formatDays(10)), shortDateYear(10));
}); });
test("formating tiny dates", function() { test("formating tiny dates", function() {