Commit 14bbc936 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Merge branch 'fix-issues-time-counter' into 'master'

Replace 'x seconds ago' with 'just now'

Closes #58425

See merge request gitlab-org/gitlab-ce!25992
parents 3de43994 448d0bc3
...@@ -92,7 +92,7 @@ export const getTimeago = () => { ...@@ -92,7 +92,7 @@ export const getTimeago = () => {
const timeAgoLocaleRemaining = [ const timeAgoLocaleRemaining = [
() => [s__('Timeago|just now'), s__('Timeago|right now')], () => [s__('Timeago|just now'), s__('Timeago|right now')],
() => [s__('Timeago|%s seconds ago'), s__('Timeago|%s seconds remaining')], () => [s__('Timeago|just now'), s__('Timeago|%s seconds remaining')],
() => [s__('Timeago|1 minute ago'), s__('Timeago|1 minute remaining')], () => [s__('Timeago|1 minute ago'), s__('Timeago|1 minute remaining')],
() => [s__('Timeago|%s minutes ago'), s__('Timeago|%s minutes remaining')], () => [s__('Timeago|%s minutes ago'), s__('Timeago|%s minutes remaining')],
() => [s__('Timeago|1 hour ago'), s__('Timeago|1 hour remaining')], () => [s__('Timeago|1 hour ago'), s__('Timeago|1 hour remaining')],
...@@ -121,7 +121,7 @@ export const getTimeago = () => { ...@@ -121,7 +121,7 @@ export const getTimeago = () => {
const timeAgoLocale = [ const timeAgoLocale = [
() => [s__('Timeago|just now'), s__('Timeago|right now')], () => [s__('Timeago|just now'), s__('Timeago|right now')],
() => [s__('Timeago|%s seconds ago'), s__('Timeago|in %s seconds')], () => [s__('Timeago|just now'), s__('Timeago|in %s seconds')],
() => [s__('Timeago|1 minute ago'), s__('Timeago|in 1 minute')], () => [s__('Timeago|1 minute ago'), s__('Timeago|in 1 minute')],
() => [s__('Timeago|%s minutes ago'), s__('Timeago|in %s minutes')], () => [s__('Timeago|%s minutes ago'), s__('Timeago|in %s minutes')],
() => [s__('Timeago|1 hour ago'), s__('Timeago|in 1 hour')], () => [s__('Timeago|1 hour ago'), s__('Timeago|in 1 hour')],
...@@ -160,7 +160,11 @@ export const getTimeago = () => { ...@@ -160,7 +160,11 @@ export const getTimeago = () => {
* @param {Boolean} setTimeago * @param {Boolean} setTimeago
*/ */
export const localTimeAgo = ($timeagoEls, setTimeago = true) => { export const localTimeAgo = ($timeagoEls, setTimeago = true) => {
getTimeago().render($timeagoEls, timeagoLanguageCode); getTimeago();
$timeagoEls.each((i, el) => {
$(el).text(timeagoInstance.format($(el).attr('datetime'), timeagoLanguageCode));
});
if (!setTimeago) { if (!setTimeago) {
return; return;
......
---
title: Make time counters show 'just now' for everything under one minute
merge_request: 25992
author: Sergiu Marton
type: changed
...@@ -8359,9 +8359,6 @@ msgstr "" ...@@ -8359,9 +8359,6 @@ msgstr ""
msgid "Timeago|%s months remaining" msgid "Timeago|%s months remaining"
msgstr "" msgstr ""
msgid "Timeago|%s seconds ago"
msgstr ""
msgid "Timeago|%s seconds remaining" msgid "Timeago|%s seconds remaining"
msgstr "" msgstr ""
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment