diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2012-06-20 10:59:54 +0100 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2012-06-20 10:59:54 +0100 |
| commit | 7d0fea4b38c214a67b2fc4b56aa670e02a3cda61 (patch) | |
| tree | 85e77cf7ba0656efbacf1497baff2ef96887bd3b /app/helpers/application_helper.rb | |
| parent | 6ef57090e436e01bc5de801bc7acb6bfadb5c490 (diff) | |
| parent | 6c4c822ef7a4491bf821326af779e5be9118c0a1 (diff) | |
Merge branch 'master' into develop
Diffstat (limited to 'app/helpers/application_helper.rb')
| -rw-r--r-- | app/helpers/application_helper.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index df016a249..cb6615199 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -127,7 +127,9 @@ module ApplicationHelper end def admin_date(date) - "#{I18n.l(date, :format => "%e %B %Y %H:%M:%S")} (#{_('{{length_of_time}} ago', :length_of_time => time_ago_in_words(date))})" + ago_text = _('{{length_of_time}} ago', :length_of_time => time_ago_in_words(date)) + exact_date = I18n.l(date, :format => "%e %B %Y %H:%M:%S") + return "#{exact_date} (#{ago_text})" end end |