diff options
| author | Marcel Amirault <ravlen@gmail.com> | 2018-07-10 10:49:28 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-07-10 10:49:28 +0000 |
| commit | 8aac79be5311ff6e545f9756a60b4b1c07885a76 (patch) | |
| tree | 0aeb60d6e787146e7ea14d3bd20901a29c05d61e /app/helpers/time_helper.rb | |
| parent | 7407efe19cab09a14147e8acc88213274694b614 (diff) | |
| download | gitlab-ce-8aac79be5311ff6e545f9756a60b4b1c07885a76.tar.gz | |
Update time_helper.rb to fix output for exact minutes.
Diffstat (limited to 'app/helpers/time_helper.rb')
| -rw-r--r-- | app/helpers/time_helper.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/helpers/time_helper.rb b/app/helpers/time_helper.rb index 271e839692a..336385f6798 100644 --- a/app/helpers/time_helper.rb +++ b/app/helpers/time_helper.rb @@ -5,9 +5,13 @@ module TimeHelper seconds = interval_in_seconds - minutes * 60 if minutes >= 1 - "#{pluralize(minutes, "minute")} #{pluralize(seconds, "second")}" + if seconds % 60 == 0 + pluralize(minutes, "minute") + else + [pluralize(minutes, "minute"), pluralize(seconds, "second")].to_sentence + end else - "#{pluralize(seconds, "second")}" + pluralize(seconds, "second") end end |