github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-21 18:12:32 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

UX: Just show "1m" if less than 1m

Browse Source
This commit is contained in:
Robin Ward
2016-08-18 12:46:27 -04:00
parent fb7409f982
commit 78e8aa823d
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,7 +88,8 @@ test("formating tiny dates", function() {
};
format = "tiny";
equal(formatMins(0), "< 1m");
equal(formatMins(0), "1m");
equal(formatMins(1), "1m");
equal(formatMins(2), "2m");
equal(formatMins(60), "1h");
equal(formatHours(4), "4h");
@ -114,7 +115,8 @@ test("formating tiny dates", function() {
equal(formatDays(2), shortDate(2));
Discourse.SiteSettings.relative_date_duration = 0;
equal(formatMins(0), "< 1m");
equal(formatMins(0), "1m");
equal(formatMins(1), "1m");
equal(formatMins(2), "2m");
equal(formatMins(60), "1h");
equal(formatDays(1), shortDate(1));