diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-06-16 16:16:35 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-06-16 16:16:35 +0000 |
commit | 0dc5eb78ca83d6e03e94080cd8c657a63af03f81 (patch) | |
tree | da1bb53215c384ea163f0228104baad40b14a5e7 /app/helpers | |
parent | 5f42009f8dcc29d559ee415e92c88858e361f063 (diff) | |
parent | 40a188b080f026ca59b7734eeda637e589b3d23d (diff) | |
download | gitlab-ce-0dc5eb78ca83d6e03e94080cd8c657a63af03f81.tar.gz |
Merge branch 'bvl-missing-translations' into 'master'
Missing translations for the project & repository pages.
Closes #33420
See merge request !12052
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/application_helper.rb | 4 | ||||
-rw-r--r-- | app/helpers/projects_helper.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 2bfc7586adc..06bbed777d5 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: :timeago_tooltip), datetime: time.to_time.getutc.iso8601, data: { toggle: 'tooltip', diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index c11dd49f4a7..84c09a32987 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -80,7 +80,7 @@ module ProjectsHelper end def remove_fork_project_message(project) - _("You are going to remove the fork relationship to source project %{forked_from_project}. Are you ABSOLUTELY sure?") % + _("You are going to remove the fork relationship to source project %{forked_from_project}. Are you ABSOLUTELY sure?") % { forked_from_project: @project.forked_from_project.name_with_namespace } end |