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

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

diff --git a/app/helpers/changesets_helper.rb b/app/helpers/changesets_helper.rb
index 97a70f7898b9f4f1d1f5d26c8ae5c41b3dc9f737..5773240ff1d64fbce02d99dc0ac2695c45bf594d 100644 (file)
--- a/app/helpers/changesets_helper.rb
+++ b/app/helpers/changesets_helper.rb
@@ -10,14 +10,14 @@ module ChangesetsHelper
   end
 
   def changeset_details(changeset)
-    if changeset.closed_at > Time.now
+    if changeset.closed_at > Time.now.utc
       action = :created
-      time = time_ago_in_words(changeset.created_at, :scope => :'datetime.distance_in_words_ago')
+      time = time_ago_in_words(changeset.created_at, :scope => :"datetime.distance_in_words_ago")
       title = l(changeset.created_at)
     else
       action = :closed
-      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
+      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)