diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2017-11-13 13:21:16 -0600 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2017-11-13 13:21:16 -0600 |
| commit | 421acc9a539725e9dd7f046c19b0b338f1257ce5 (patch) | |
| tree | 11abe24ca4f272b25c00723ca1acb02dfc7126c2 /app/assets/javascripts/lib/utils/datetime_utility.js | |
| parent | 74b87f02db2ebda0b2b16a60dd6759fe6e8de95a (diff) | |
| parent | 2932f532c35a1fff58486920a03227862594f54d (diff) | |
| download | gitlab-ce-421acc9a539725e9dd7f046c19b0b338f1257ce5.tar.gz | |
Merge branch 'master' into backport-add-epic-sidebar
Diffstat (limited to 'app/assets/javascripts/lib/utils/datetime_utility.js')
| -rw-r--r-- | app/assets/javascripts/lib/utils/datetime_utility.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/javascripts/lib/utils/datetime_utility.js b/app/assets/javascripts/lib/utils/datetime_utility.js index 8d0bab55843..52bdc05a58c 100644 --- a/app/assets/javascripts/lib/utils/datetime_utility.js +++ b/app/assets/javascripts/lib/utils/datetime_utility.js @@ -2,6 +2,7 @@ import timeago from 'timeago.js'; import dateFormat from 'vendor/date.format'; +import { pluralize } from './text_utility'; import { lang, @@ -142,9 +143,9 @@ export function timeIntervalInWords(intervalInSeconds) { let text = ''; if (minutes >= 1) { - text = `${minutes} ${gl.text.pluralize('minute', minutes)} ${seconds} ${gl.text.pluralize('second', seconds)}`; + text = `${minutes} ${pluralize('minute', minutes)} ${seconds} ${pluralize('second', seconds)}`; } else { - text = `${seconds} ${gl.text.pluralize('second', seconds)}`; + text = `${seconds} ${pluralize('second', seconds)}`; } return text; } |