diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-10-02 13:16:33 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-10-02 13:16:33 +0300 |
| commit | 17758dddf79c3c68380607f8d33b087f19582bf4 (patch) | |
| tree | b64e2d87538bad837bcd646db692d28fd48ce12e /app | |
| parent | 42d7d355805e544513fc89dcb037caf436770a25 (diff) | |
| parent | a7ff47b7991fe02e7de6e95311b0f7b3f73621cd (diff) | |
Merge branch 'translation-timeago-a-while-ago' into 'master'
Fix translation for 'a while' => 'in a while'
See merge request gitlab-org/gitlab-ce!14433
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/lib/utils/datetime_utility.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/lib/utils/datetime_utility.js b/app/assets/javascripts/lib/utils/datetime_utility.js index 1d1763c3963..29fc91733b3 100644 --- a/app/assets/javascripts/lib/utils/datetime_utility.js +++ b/app/assets/javascripts/lib/utils/datetime_utility.js @@ -55,7 +55,7 @@ window.dateFormat = dateFormat; if (!timeagoInstance) { const localeRemaining = function(number, index) { return [ - [s__('Timeago|less than a minute ago'), s__('Timeago|a while')], + [s__('Timeago|less than a minute ago'), s__('Timeago|in a while')], [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|%s minutes ago'), s__('Timeago|%s minutes remaining')], @@ -73,7 +73,7 @@ window.dateFormat = dateFormat; }; locale = function(number, index) { return [ - [s__('Timeago|less than a minute ago'), s__('Timeago|a while')], + [s__('Timeago|less than a minute ago'), s__('Timeago|in a while')], [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|%s minutes ago'), s__('Timeago|in %s minutes')], |