From: Kohei Yoshino <kohei.yoshino@gmail.com>
Date: Wed, 29 May 2019 14:09:08 +0000 (-0400)
Subject: Bug 1543881 - Modify relative date labels like “a day ago” and “a year ago“
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0281205b8b05565f80bc40b92a0331c1725a4185;p=thirdparty%2Fbugzilla.git

Bug 1543881 - Modify relative date labels like “a day ago” and “a year ago“
---

diff --git a/Bugzilla/Util.pm b/Bugzilla/Util.pm
index a59ba5d02..ddeda869f 100644
--- a/Bugzilla/Util.pm
+++ b/Bugzilla/Util.pm
@@ -654,17 +654,17 @@ sub time_ago {
   my $mo = round($dd / 30);
   my $yy = round($mo / 12);
 
-  return 'just now'           if $ss < 10;
+  return 'Just now'           if $ss < 10;
   return $ss . ' seconds ago' if $ss < 45;
-  return 'a minute ago'       if $ss < 90;
+  return '1 minute ago'       if $ss < 90;
   return $mm . ' minutes ago' if $mm < 45;
-  return 'an hour ago'        if $mm < 90;
+  return 'Last hour'          if $mm < 90;
   return $hh . ' hours ago'   if $hh < 24;
-  return 'a day ago'          if $hh < 36;
+  return 'Yesterday'          if $hh < 36;
   return $dd . ' days ago'    if $dd < 30;
-  return 'a month ago'        if $dd < 45;
+  return 'Last month'         if $dd < 45;
   return $mo . ' months ago'  if $mo < 12;
-  return 'a year ago'         if $mo < 18;
+  return 'Last year'          if $mo < 18;
   return $yy . ' years ago';
 }
 
diff --git a/js/util.js b/js/util.js
index 781fd3c67..83ba3b3c5 100644
--- a/js/util.js
+++ b/js/util.js
@@ -355,16 +355,16 @@ function timeAgo(param) {
         dd = Math.round(hh / 24),
         mo = Math.round(dd / 30),
         yy = Math.round(mo / 12);
-    if (ss < 10) return 'just now';
+    if (ss < 10) return 'Just now';
     if (ss < 45) return ss + ' seconds ago';
-    if (ss < 90) return 'a minute ago';
+    if (ss < 90) return '1 minute ago';
     if (mm < 45) return mm + ' minutes ago';
-    if (mm < 90) return 'an hour ago';
+    if (mm < 90) return 'Last hour';
     if (hh < 24) return hh + ' hours ago';
-    if (hh < 36) return 'a day ago';
+    if (hh < 36) return 'Yesterday';
     if (dd < 30) return dd + ' days ago';
-    if (dd < 45) return 'a month ago';
+    if (dd < 45) return 'Last month';
     if (mo < 12) return mo + ' months ago';
-    if (mo < 18) return 'a year ago';
+    if (mo < 18) return 'Last year';
     return yy + ' years ago';
 }