diff options
| author | Bob Van Landuyt <bob@gitlab.com> | 2017-06-12 10:35:36 +0200 |
|---|---|---|
| committer | Bob Van Landuyt <bob@gitlab.com> | 2017-06-15 14:47:05 +0200 |
| commit | 67d52fe48f4116731fcfbb5d5c658ad8d11eb4b9 (patch) | |
| tree | 97da661c4d89bdd6318739440a3b96625c6411bf | |
| parent | 0c04a890db17f3e23e17ace5221836e6f748fc7e (diff) | |
| download | gitlab-ce-67d52fe48f4116731fcfbb5d5c658ad8d11eb4b9.tar.gz | |
Use the same time format as before
| -rw-r--r-- | app/helpers/application_helper.rb | 2 | ||||
| -rw-r--r-- | config/locales/en.yml | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 99e2f8c6bca..06bbed777d5 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -169,7 +169,7 @@ module ApplicationHelper element = content_tag :time, l(time, format: "%b %d, %Y"), class: css_classes, - title: l(time.to_time.in_time_zone, format: :short), + title: l(time.to_time.in_time_zone, format: :timeago_tooltip), datetime: time.to_time.getutc.iso8601, data: { toggle: 'tooltip', diff --git a/config/locales/en.yml b/config/locales/en.yml index 77d59c5d77a..2f21a907154 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -248,4 +248,5 @@ en: default: "%a, %d %b %Y %H:%M:%S %z" long: "%B %d, %Y %H:%M" short: "%d %b %H:%M" + timeago_tooltip: "%b %-d, %Y %-k:%M%P" pm: pm |