Merge remote-tracking branch 'upstream/pull/2919' into master

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

diff --git a/app/helpers/changesets_helper.rb b/app/helpers/changesets_helper.rb
index 4a327c16c158139d1cb7e62d956449263b6a112f..b91810e95c58bd87cd6665d61f5de43a386b3f35 100644 (file)
--- a/app/helpers/changesets_helper.rb
+++ b/app/helpers/changesets_helper.rb
@@ -12,12 +12,12 @@ module ChangesetsHelper
   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
-      time = distance_of_time_in_words_to_now(changeset.closed_at)
-      title = "#{t('browse.created')}: #{l(changeset.created_at)}
#{t('browse.closed')}: #{l(changeset.closed_at)}".html_safe
+      time = time_ago_in_words(changeset.closed_at, :scope => :'datetime.distance_in_words_ago')
+      title = safe_join([t("browse.created"), ": ", l(changeset.created_at), "
".html_safe, t("browse.closed"), ": ", l(changeset.closed_at)])
     end
 
     if params.key?(:display_name)