Merge pull request #3889 from tomhughes/distances

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

diff --git a/app/helpers/note_helper.rb b/app/helpers/note_helper.rb
index d85881a3111027cb3fe8f5b178deb0fc1acb6486..809480a04020df137e8b7b98e5c32d9da01605bb 100644 (file)
--- a/app/helpers/note_helper.rb
+++ b/app/helpers/note_helper.rb
@@ -3,11 +3,11 @@ module NoteHelper
 
   def note_event(event, at, by)
     if by.nil?
 
   def note_event(event, at, by)
     if by.nil?

-      t("browse.note." + event + "_by_anonymous_html",
+      t("browse.note.#{event}_by_anonymous_html",

         :when => friendly_date_ago(at),
         :exact_time => l(at))
     else
         :when => friendly_date_ago(at),
         :exact_time => l(at))
     else

-      t("browse.note." + event + "_by_html",
+      t("browse.note.#{event}_by_html",

         :when => friendly_date_ago(at),
         :exact_time => l(at),
         :user => note_author(by))
         :when => friendly_date_ago(at),
         :exact_time => l(at),
         :user => note_author(by))


@@ -23,4 +23,9 @@ module NoteHelper
       link_to h(author.display_name), link_options.merge(:controller => "/users", :action => "show", :display_name => author.display_name)
     end
   end
       link_to h(author.display_name), link_options.merge(:controller => "/users", :action => "show", :display_name => author.display_name)
     end
   end

+
+  def disappear_in(note)
+    date = note.freshly_closed_until
+    tag.span(distance_of_time_in_words(date, Time.now.utc), :title => l(date, :format => :friendly))
+  end

 end
 end