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

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

diff --git a/app/helpers/changesets_helper.rb b/app/helpers/changesets_helper.rb
index 9d46de12009ca89a8e80f71f341a754a4078e82e..3a26c2001c9dc5884c1fd996d8f13bfcb483d977 100644 (file)
--- a/app/helpers/changesets_helper.rb
+++ b/app/helpers/changesets_helper.rb
@@ -14,16 +14,18 @@ module ChangesetsHelper
       action = :created
       time = time_ago_in_words(changeset.created_at, :scope => :"datetime.distance_in_words_ago")
       title = l(changeset.created_at)
+      datetime = changeset.created_at.xmlschema
     else
       action = :closed
       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)])
+      datetime = changeset.closed_at.xmlschema
     end
 
     if params.key?(:display_name)
-      t "browse.#{action}_ago_html", :time_ago => tag.abbr(time, :title => title)
+      t "browse.#{action}_ago_html", :time_ago => tag.time(time, :title => title, :datetime => datetime)
     else
-      t "browse.#{action}_ago_by_html", :time_ago => tag.abbr(time, :title => title),
+      t "browse.#{action}_ago_by_html", :time_ago => tag.time(time, :title => title, :datetime => datetime),
                                         :user => changeset_user_link(changeset)
     end
   end