diff options
| author | Phil Hughes <me@iamphill.com> | 2017-06-30 19:05:30 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-06-30 19:05:30 +0000 |
| commit | a704f9e5803e833d00f3abcf1d68eac9b9701653 (patch) | |
| tree | 9f8b5608bedd57a74017bf8b8f0fff9098797ea6 | |
| parent | a9847ede80e3a3a5809b893c74c56c4d0d099e50 (diff) | |
| parent | 4c20ee71a979121d88f90e475825fc03a01e3468 (diff) | |
| download | gitlab-ce-a704f9e5803e833d00f3abcf1d68eac9b9701653.tar.gz | |
Merge branch 'restore-timeago-translation' into 'master'
Restore timeago translations in renderTimeago.
See merge request !12590
| -rw-r--r-- | app/assets/javascripts/lib/utils/datetime_utility.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/lib/utils/datetime_utility.js b/app/assets/javascripts/lib/utils/datetime_utility.js index 034a1ec2054..1d1763c3963 100644 --- a/app/assets/javascripts/lib/utils/datetime_utility.js +++ b/app/assets/javascripts/lib/utils/datetime_utility.js @@ -116,7 +116,7 @@ window.dateFormat = dateFormat; const timeagoEls = $els || document.querySelectorAll('.js-timeago-render'); // timeago.js sets timeouts internally for each timeago value to be updated in real time - gl.utils.getTimeago().render(timeagoEls); + gl.utils.getTimeago().render(timeagoEls, lang); }; w.gl.utils.getDayDifference = function(a, b) { |