Merge branch '47182-use-the-default-strings-of-timeago-js' into 'master'

Use the default strings of timeago.js for timeago

Closes #47182

See merge request gitlab-org/gitlab-ce!19350

1 files changed, 18 insertions, 18 deletions

diff --git a/app/assets/javascripts/lib/utils/datetime_utility.js b/app/assets/javascripts/lib/utils/datetime_utility.js
index f850e818bdf..7cca32dc6fa 100644
--- a/app/assets/javascripts/lib/utils/datetime_utility.js
+++ b/app/assets/javascripts/lib/utils/datetime_utility.js
@@ -79,37 +79,37 @@ export function getTimeago() {
   if (!timeagoInstance) {
     const localeRemaining = function getLocaleRemaining(number, index) {
       return [
-        [s__('Timeago|less than a minute ago'), s__('Timeago|right now')],
-        [s__('Timeago|less than a minute ago'), s__('Timeago|%s seconds remaining')],
-        [s__('Timeago|about a minute ago'), s__('Timeago|1 minute remaining')],
+        [s__('Timeago|just now'), s__('Timeago|right now')],
+        [s__('Timeago|%s seconds ago'), s__('Timeago|%s seconds remaining')],
+        [s__('Timeago|1 minute ago'), s__('Timeago|1 minute remaining')],
         [s__('Timeago|%s minutes ago'), s__('Timeago|%s minutes remaining')],
-        [s__('Timeago|about an hour ago'), s__('Timeago|1 hour remaining')],
-        [s__('Timeago|about %s hours ago'), s__('Timeago|%s hours remaining')],
-        [s__('Timeago|a day ago'), s__('Timeago|1 day remaining')],
+        [s__('Timeago|1 hour ago'), s__('Timeago|1 hour remaining')],
+        [s__('Timeago|%s hours ago'), s__('Timeago|%s hours remaining')],
+        [s__('Timeago|1 day ago'), s__('Timeago|1 day remaining')],
         [s__('Timeago|%s days ago'), s__('Timeago|%s days remaining')],
-        [s__('Timeago|a week ago'), s__('Timeago|1 week remaining')],
+        [s__('Timeago|1 week ago'), s__('Timeago|1 week remaining')],
         [s__('Timeago|%s weeks ago'), s__('Timeago|%s weeks remaining')],
-        [s__('Timeago|a month ago'), s__('Timeago|1 month remaining')],
+        [s__('Timeago|1 month ago'), s__('Timeago|1 month remaining')],
         [s__('Timeago|%s months ago'), s__('Timeago|%s months remaining')],
-        [s__('Timeago|a year ago'), s__('Timeago|1 year remaining')],
+        [s__('Timeago|1 year ago'), s__('Timeago|1 year remaining')],
         [s__('Timeago|%s years ago'), s__('Timeago|%s years remaining')],
       ][index];
     };
     const locale = function getLocale(number, index) {
       return [
-        [s__('Timeago|less than a minute ago'), s__('Timeago|right now')],
-        [s__('Timeago|less than a minute ago'), s__('Timeago|in %s seconds')],
-        [s__('Timeago|about a minute ago'), s__('Timeago|in 1 minute')],
+        [s__('Timeago|just now'), s__('Timeago|right now')],
+        [s__('Timeago|%s seconds ago'), s__('Timeago|in %s seconds')],
+        [s__('Timeago|1 minute ago'), s__('Timeago|in 1 minute')],
         [s__('Timeago|%s minutes ago'), s__('Timeago|in %s minutes')],
-        [s__('Timeago|about an hour ago'), s__('Timeago|in 1 hour')],
-        [s__('Timeago|about %s hours ago'), s__('Timeago|in %s hours')],
-        [s__('Timeago|a day ago'), s__('Timeago|in 1 day')],
+        [s__('Timeago|1 hour ago'), s__('Timeago|in 1 hour')],
+        [s__('Timeago|%s hours ago'), s__('Timeago|in %s hours')],
+        [s__('Timeago|1 day ago'), s__('Timeago|in 1 day')],
         [s__('Timeago|%s days ago'), s__('Timeago|in %s days')],
-        [s__('Timeago|a week ago'), s__('Timeago|in 1 week')],
+        [s__('Timeago|1 week ago'), s__('Timeago|in 1 week')],
         [s__('Timeago|%s weeks ago'), s__('Timeago|in %s weeks')],
-        [s__('Timeago|a month ago'), s__('Timeago|in 1 month')],
+        [s__('Timeago|1 month ago'), s__('Timeago|in 1 month')],
         [s__('Timeago|%s months ago'), s__('Timeago|in %s months')],
-        [s__('Timeago|a year ago'), s__('Timeago|in 1 year')],
+        [s__('Timeago|1 year ago'), s__('Timeago|in 1 year')],
         [s__('Timeago|%s years ago'), s__('Timeago|in %s years')],
       ][index];
     };