From: Julian Descottes <julian.descottes@gmail.com>
Date: Wed, 26 Feb 2020 04:17:11 +0000 (+0100)
Subject: Bug 1614634 - 13 hours ago was not "1 day ago"
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8fe0cc697115d5379dc490c6ad64e4395341632c;p=thirdparty%2Fbugzilla.git

Bug 1614634 - 13 hours ago was not "1 day ago"
---

diff --git a/Bugzilla/Util.pm b/Bugzilla/Util.pm
index 87a4a0cab..2a30d68ae 100644
--- a/Bugzilla/Util.pm
+++ b/Bugzilla/Util.pm
@@ -655,16 +655,16 @@ sub time_ago {
   my $yy = round($mo / 12);
 
   return 'Just now'           if $ss < 10;
-  return $ss . ' seconds ago' if $mm < 1;
-  return '1 minute ago'       if $mm < 2;
-  return $mm . ' minutes ago' if $hh < 1;
-  return '1 hour ago'         if $hh < 2;
-  return $hh . ' hours ago'   if $dd < 1;
-  return '1 day ago'          if $dd < 2;
-  return $dd . ' days ago'    if $mo < 1;
-  return '1 month ago'        if $mo < 2;
-  return $mo . ' months ago'  if $yy < 1;
-  return '1 year ago'         if $yy < 2;
+  return $ss . ' seconds ago' if $ss < 45;
+  return '1 minute ago'       if $ss < 90;
+  return $mm . ' minutes ago' if $mm < 45;
+  return '1 hour ago'         if $mm < 90;
+  return $hh . ' hours ago'   if $hh < 24;
+  return '1 day ago'          if $hh < 36;
+  return $dd . ' days ago'    if $dd < 30;
+  return '1 month ago'        if $dd < 45;
+  return $mo . ' months ago'  if $mo < 12;
+  return '1 year ago'         if $mo < 18;
   return $yy . ' years ago';
 }
 
diff --git a/js/util.js b/js/util.js
index a8df5dfd5..670fd6e38 100644
--- a/js/util.js
+++ b/js/util.js
@@ -356,16 +356,16 @@ function timeAgo(param) {
         mo = Math.round(dd / 30),
         yy = Math.round(mo / 12);
     if (ss < 10) return 'Just now';
-    if (mm < 1) return ss + ' seconds ago';
-    if (mm < 2) return '1 minute ago';
-    if (hh < 1) return mm + ' minutes ago';
-    if (hh < 2) return '1 hour ago';
-    if (dd < 1) return hh + ' hours ago';
-    if (dd < 2) return '1 day ago';
-    if (mo < 1) return dd + ' days ago';
-    if (mo < 2) return '1 month ago';
-    if (yy < 1) return mo + ' months ago';
-    if (yy < 2) return '1 year ago';
+    if (ss < 45) return ss + ' seconds ago';
+    if (ss < 90) return '1 minute ago';
+    if (mm < 45) return mm + ' minutes ago';
+    if (mm < 90) return '1 hour ago';
+    if (hh < 24) return hh + ' hours ago';
+    if (hh < 36) return '1 day ago';
+    if (dd < 30) return dd + ' days ago';
+    if (dd < 45) return '1 month ago';
+    if (mo < 12) return mo + ' months ago';
+    if (mo < 18) return '1 year ago';
     return yy + ' years ago';
 }