github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-07-11 01:43:37 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: relative date format consistency (#31349)

Browse Source 
This changes makes relative date formats consistent for both tiny and
medium formats.

Previously we were removing 12 hours from the date for medium format
when it was more than 2520 minutes (42 hours) but not for tiny date
formats.
This commit is contained in:
David Battersby
2025-02-14 14:17:48 +04:00
committed by GitHub
parent 54b1e3195c
commit 04531f1443
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/app/lib/formatter.js
View File

@ -296,7 +296,7 @@ export function relativeAgeMediumSpan(distance, leaveAgo) {
break; break;
case distanceInMinutes >= 2520 && distanceInMinutes <= 129599: case distanceInMinutes >= 2520 && distanceInMinutes <= 129599:
formatted = t("x_days", { formatted = t("x_days", {
count: Math.round((distanceInMinutes - 720.0) / 1440.0), count: Math.round(distanceInMinutes / 1440.0),
}); });
break; break;
case distanceInMinutes >= 129600 && distanceInMinutes <= 525599: case distanceInMinutes >= 129600 && distanceInMinutes <= 525599:

4
app/assets/javascripts/discourse/tests/unit/lib/formatter-test.js
View File

@ -92,7 +92,7 @@ module("Unit | Utility | formatter", function (hooks) {
); );
assert.strictEqual( assert.strictEqual(
strip(formatDays(4.85, { format: "medium", leaveAgo: true })), strip(formatDays(4.85, { format: "medium", leaveAgo: true })),
"4 days ago" "5 days ago"
); );
assert.strictEqual(strip(formatMins(0, { format: "medium" })), "just now"); assert.strictEqual(strip(formatMins(0, { format: "medium" })), "just now");
@ -110,7 +110,7 @@ module("Unit | Utility | formatter", function (hooks) {
"23 hours" "23 hours"
); );
assert.strictEqual(strip(formatHours(23.5, { format: "medium" })), "1 day"); assert.strictEqual(strip(formatHours(23.5, { format: "medium" })), "1 day");
assert.strictEqual(strip(formatDays(4.85, { format: "medium" })), "4 days"); assert.strictEqual(strip(formatDays(4.85, { format: "medium" })), "5 days");
assert.strictEqual( assert.strictEqual(
strip(formatDays(6, { format: "medium" })), strip(formatDays(6, { format: "medium" })),