Merge pull request #4150 from AntonKhorev/note-table-bootstrap-highlight

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

diff --git a/app/helpers/note_helper.rb b/app/helpers/note_helper.rb
index dbe0c89f78e0f687f65934070b68f4ac94f1d6d4..42fd089e47ef1105b09a4e1a0c5e024044bd4ab4 100644 (file)
--- a/app/helpers/note_helper.rb
+++ b/app/helpers/note_helper.rb
@@ -1,14 +1,16 @@
 module NoteHelper
 module NoteHelper

+  include ActionView::Helpers::TranslationHelper
+

   def note_event(event, at, by)
     if by.nil?
   def note_event(event, at, by)
     if by.nil?

-      I18n.t("browse.note." + event + "_by_anonymous",
-             :when => friendly_date_ago(at),
-             :exact_time => l(at)).html_safe
+      t("notes.show.event_#{event}_by_anonymous_html",
+        :time_ago => tag.abbr(friendly_date_ago(at),
+                              :title => l(at)))

     else
     else

-      I18n.t("browse.note." + event + "_by",
-             :when => friendly_date_ago(at),
-             :exact_time => l(at),
-             :user => note_author(by)).html_safe
+      t("notes.show.event_#{event}_by_html",
+        :time_ago => tag.abbr(friendly_date_ago(at),
+                              :title => l(at)),
+        :user => note_author(by))

     end
   end
 
     end
   end
 


@@ -21,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