From c4ec9a097c2e07f10feaef142d8a8e296f9d4420 Mon Sep 17 00:00:00 2001
From: aydreeihn <adriane@enhancesoft.com>
Date: Thu, 16 Aug 2018 09:07:12 -0500
Subject: [PATCH] Relative Time Fixes:
This commit removes the logic that was used for time within 2 days which would give a result of either today or tomorrow when something could actually be in 2 days instead.
It also rounds relative time that is within 29 days so that the result will be more accurate.
Ex: 1.99 will round to 2 instead of showing 1
---
include/class.format.php | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/include/class.format.php b/include/class.format.php
index 9b5f0fe5a..fead2044d 100644
--- a/include/class.format.php
+++ b/include/class.format.php
@@ -894,17 +894,10 @@ class Format {
return sprintf($timeDiff >= 0 ? __('%d hours ago') : __('in %d hours'), $absTimeDiff / 3600);
}
- // within 2 days
- $days2 = 2 * 86400;
- if ($absTimeDiff < $days2) {
- // XXX: yesterday / tomorrow?
- return $absTimeDiff >= 0 ? __('yesterday') : __('tomorrow');
- }
-
// within 29 days
$days29 = 29 * 86400;
if ($absTimeDiff < $days29) {
- return sprintf($timeDiff >= 0 ? __('%d days ago') : __('in %d days'), $absTimeDiff / 86400);
+ return sprintf($timeDiff >= 0 ? __('%d days ago') : __('in %d days'), round($absTimeDiff / 86400));
}
// within 60 days
--
GitLab