diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-06-23 09:33:42 +0100 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-06-23 09:33:42 +0100 |
| commit | db1a388f0a7b37cc0ceb3ca07b995b34dabdba58 (patch) | |
| tree | e34df5ae0dacdbf6c3b77542b22f2d9e3799d322 /app/helpers/application_helper.rb | |
| parent | a7cc84b9b2b430644fe23e6328d7ab289e7abf0a (diff) | |
| parent | 7d0fea4b38c214a67b2fc4b56aa670e02a3cda61 (diff) | |
Merge branch 'develop' of github.com:sebbacon/alaveteli into develop
Conflicts:
Gemfile.lock
script/handle-mail-replies
script/handle-mail-replies.rb
spec/controllers/request_controller_spec.rb
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 |