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

diff --git a/Bugzilla/Util.pm b/Bugzilla/Util.pm
index 87a4a0cab1f30270d618f3fcce81faeeb552aec5..2a30d68aecfd47a1b9b818733f28d9fb927dcf36 100644 (file)
--- 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 a8df5dfd53b4f2b22544cf1bb118f990ba38ed37..670fd6e380c68e422561ffe50b985cc65fa626e9 100644 (file)
--- 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';
 }