diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-20 12:40:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-20 12:40:42 +0300 |
commit | ee664acb356f8123f4f6b00b73c1e1cf0866c7fb (patch) | |
tree | f8479f94a28f66654c6a4f6fb99bad6b4e86a40e /app/helpers/time_helper.rb | |
parent | 62f7d5c5b69180e82ae8196b7b429eeffc8e7b4f (diff) |
Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42
Diffstat (limited to 'app/helpers/time_helper.rb')
-rw-r--r-- | app/helpers/time_helper.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/helpers/time_helper.rb b/app/helpers/time_helper.rb index ecedbfb2a4f..cb6f60ab79b 100644 --- a/app/helpers/time_helper.rb +++ b/app/helpers/time_helper.rb @@ -8,12 +8,12 @@ module TimeHelper if minutes >= 1 if seconds % 60 == 0 - pluralize(minutes, "minute") + n_('%d minute', '%d minutes', minutes) % minutes else - [pluralize(minutes, "minute"), pluralize(seconds, "second")].to_sentence + [n_('%d minute', '%d minutes', minutes) % minutes, n_('%d second', '%d seconds', seconds) % seconds].to_sentence end else - pluralize(seconds, "second") + n_('%d second', '%d seconds', seconds) % seconds end end |