Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Van Landuyt <bob@gitlab.com>2017-06-09 17:38:49 +0300
committerBob Van Landuyt <bob@gitlab.com>2017-06-15 15:47:04 +0300
commitd9238ee6c0a0bea45b82638d04a913441344ffcf (patch)
treece520d3b4ba597909baea9d23e10dd21c050fa29 /app/helpers/application_helper.rb
parentfc7cb8d1168a1304716cd9d63a7590362e873b31 (diff)
Translate time tooltips.
Let the backend do the translation.
Diffstat (limited to 'app/helpers/application_helper.rb')
-rw-r--r--app/helpers/application_helper.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 2bfc7586adc..99e2f8c6bca 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -167,9 +167,9 @@ module ApplicationHelper
css_classes = short_format ? 'js-short-timeago' : 'js-timeago'
css_classes << " #{html_class}" unless html_class.blank?
- element = content_tag :time, time.strftime("%b %d, %Y"),
+ element = content_tag :time, l(time, format: "%b %d, %Y"),
class: css_classes,
- title: time.to_time.in_time_zone.to_s(:medium),
+ title: l(time.to_time.in_time_zone, format: :short),
datetime: time.to_time.getutc.iso8601,
data: {
toggle: 'tooltip',