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

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

diff --git a/app/helpers/note_helper.rb b/app/helpers/note_helper.rb
index 42fd089e47ef1105b09a4e1a0c5e024044bd4ab4..21c8fa51e8c4326cd37182aeda636b4898c15d20 100644 (file)
--- a/app/helpers/note_helper.rb
+++ b/app/helpers/note_helper.rb
@@ -4,12 +4,10 @@ module NoteHelper
   def note_event(event, at, by)
     if by.nil?
       t("notes.show.event_#{event}_by_anonymous_html",
   def note_event(event, at, by)
     if by.nil?
       t("notes.show.event_#{event}_by_anonymous_html",

-        :time_ago => tag.abbr(friendly_date_ago(at),
-                              :title => l(at)))
+        :time_ago => friendly_date_ago(at))

     else
       t("notes.show.event_#{event}_by_html",
     else
       t("notes.show.event_#{event}_by_html",

-        :time_ago => tag.abbr(friendly_date_ago(at),
-                              :title => l(at)),
+        :time_ago => friendly_date_ago(at),

         :user => note_author(by))
     end
   end
         :user => note_author(by))
     end
   end


@@ -23,9 +21,4 @@ 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