paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 13:33:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

timerender: Render past time till 24 hours before showing yesterday.

Browse Source 
This avoids the issue of all the topics in recent topics marked
as yesterday after mid-night.

This change also affects other pieces of UI using this function
like buddy list in a similar way.
This commit is contained in:
Aman Agrawal
2021-06-17 21:07:35 +00:00
committed by Tim Abbott
parent 054be8dd2e
commit 3e872b1fa5
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
frontend_tests/node_tests/timerender.js
View File

@@ -257,13 +257,15 @@ run_test("last_seen_status_from_date", () => {
assert_same({minutes: -30}, $t({defaultMessage: "30 minutes ago"}));
assert_same({hours: -1}, $t({defaultMessage: "Yesterday"}));
assert_same({hours: -1}, $t({defaultMessage: "An hour ago"}));
assert_same({hours: -2}, $t({defaultMessage: "Yesterday"}));
assert_same({hours: -2}, $t({defaultMessage: "2 hours ago"}));
assert_same({hours: -20}, $t({defaultMessage: "Yesterday"}));
assert_same({hours: -20}, $t({defaultMessage: "20 hours ago"}));
assert_same({days: -1}, $t({defaultMessage: "Yesterday"}));
assert_same({hours: -24}, $t({defaultMessage: "Yesterday"}));
assert_same({hours: -48}, $t({defaultMessage: "2 days ago"}));
assert_same({days: -2}, $t({defaultMessage: "2 days ago"}));

2
static/js/timerender.js
View File

@@ -81,7 +81,7 @@ export function last_seen_status_from_date(last_active_date, current_date = new
const days_old = differenceInCalendarDays(current_date, last_active_date);
const hours = Math.floor(minutes / 60);
if (days_old === 0) {
if (hours < 24) {
if (hours === 1) {
return $t({defaultMessage: "An hour ago"});
}