Bump eslint from 8.37.0 to 8.38.0

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

diff --git a/app/helpers/note_helper.rb b/app/helpers/note_helper.rb
index f2bff861f7209ae4f47504579efbec546430b8c3..42fd089e47ef1105b09a4e1a0c5e024044bd4ab4 100644 (file)
--- a/app/helpers/note_helper.rb
+++ b/app/helpers/note_helper.rb
@@ -1,17 +1,31 @@
 module NoteHelper
-  def note_event(at, by)
+  include ActionView::Helpers::TranslationHelper
+
+  def note_event(event, at, by)
     if by.nil?
-      I18n.t("browse.note.at_html", :when => friendly_date(at)).html_safe
+      t("notes.show.event_#{event}_by_anonymous_html",
+        :time_ago => tag.abbr(friendly_date_ago(at),
+                              :title => l(at)))
     else
-      I18n.t("browse.note.at_by_html", :when => friendly_date(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
 
   def note_author(author, link_options = {})
     if author.nil?
       ""
+    elsif author.status == "deleted"
+      t("users.no_such_user.deleted")
     else
-      link_to h(author.display_name), link_options.merge({:controller => "user", :action => "view", :display_name => author.display_name})
+      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