Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Post age time not being translated correctly.

This commit is contained in:
Guo Xiang Tan 2015-08-31 00:11:52 +08:00
parent 322df1862d
commit 50ce95b37d
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,13 +142,13 @@ function relativeAgeTiny(date){
case(distanceInMinutes >= 45 && distanceInMinutes <= 89):
formatted = t("about_x_hours", {count: 1});
break;
case(distanceInMinutes >= 90 && distanceInMinutes <= 1439):
case(distanceInMinutes >= 90 && distanceInMinutes <= 1409):
formatted = t("about_x_hours", {count: Math.round(distanceInMinutes / 60.0)});
break;
case(Discourse.SiteSettings.relative_date_duration === 0 && distanceInMinutes <= 525599):
formatted = shortDateNoYear(date);
break;
case(distanceInMinutes >= 1440 && distanceInMinutes <= 2519):
case(distanceInMinutes >= 1410 && distanceInMinutes <= 2519):
formatted = t("x_days", {count: 1});
break;
case(distanceInMinutes >= 2520 && distanceInMinutes <= ((Discourse.SiteSettings.relative_date_duration||14) * 1440)):
@ -266,4 +266,3 @@ export function number(val) {
}
return val.toString();
}

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

@ -91,6 +91,8 @@ test("formating tiny dates", function() {
equal(formatMins(2), "2m");
equal(formatMins(60), "1h");
equal(formatHours(4), "4h");
equal(formatHours(23), "23h");
equal(formatHours(23.5), "1d");
equal(formatDays(1), "1d");
equal(formatDays(14), "14d");
equal(formatDays(15), shortDate(15));