Move changeset created/closed time ago strings to changesets locale

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

diff --git a/app/helpers/changesets_helper.rb b/app/helpers/changesets_helper.rb
index 4c0236b6b2ab6e8bee86a4cd749be8f37b0ebc2d..dbee08c507f175e691fffae849b45b357f3515f7 100644 (file)
--- a/app/helpers/changesets_helper.rb
+++ b/app/helpers/changesets_helper.rb
@@ -10,25 +10,23 @@ module ChangesetsHelper
   end
 
   def changeset_details(changeset)
   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")
       title = l(changeset.created_at)
       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")
     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)])
+      title = safe_join([t("changesets.show.created", :when => l(changeset.created_at)), "
".html_safe, t("changesets.show.closed", :when => l(changeset.closed_at))])
+      datetime = changeset.closed_at.xmlschema

     end
 
     if params.key?(:display_name)
     end
 
     if params.key?(:display_name)

-      t "browse.#{action}_html",
-        :time => time,
-        :title => title
+      t "changesets.show.#{action}_ago_html", :time_ago => tag.time(time, :title => title, :datetime => datetime)

     else
     else

-      t "browse.#{action}_by_html",
-        :time => time,
-        :title => title,
-        :user => changeset_user_link(changeset)
+      t "changesets.show.#{action}_ago_by_html", :time_ago => tag.time(time, :title => title, :datetime => datetime),
+                                                 :user => changeset_user_link(changeset)

     end
   end
 
     end
   end