Merge remote-tracking branch 'upstream/pull/2599'

[rails.git] / app / helpers / changesets_helper.rb

diff --git a/app/helpers/changesets_helper.rb b/app/helpers/changesets_helper.rb
index 4a327c16c158139d1cb7e62d956449263b6a112f..97a70f7898b9f4f1d1f5d26c8ae5c41b3dc9f737 100644 (file)
--- a/app/helpers/changesets_helper.rb
+++ b/app/helpers/changesets_helper.rb
@@ -12,11 +12,11 @@ module ChangesetsHelper
   def changeset_details(changeset)
     if changeset.closed_at > Time.now
       action = :created
   def changeset_details(changeset)
     if changeset.closed_at > Time.now
       action = :created

-      time = distance_of_time_in_words_to_now(changeset.created_at)
+      time = time_ago_in_words(changeset.created_at, :scope => :'datetime.distance_in_words_ago')

       title = l(changeset.created_at)
     else
       action = :closed
       title = l(changeset.created_at)
     else
       action = :closed

-      time = distance_of_time_in_words_to_now(changeset.closed_at)
+      time = time_ago_in_words(changeset.closed_at, :scope => :'datetime.distance_in_words_ago')

       title = "#{t('browse.created')}: #{l(changeset.created_at)}
#{t('browse.closed')}: #{l(changeset.closed_at)}".html_safe
     end
 
       title = "#{t('browse.created')}: #{l(changeset.created_at)}
#{t('browse.closed')}: #{l(changeset.closed_at)}".html_safe
     end