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

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

diff --git a/app/helpers/note_helper.rb b/app/helpers/note_helper.rb
index bfd7f493dfb8103b9d85b1b9187ce2bb7ec8b162..dbe0c89f78e0f687f65934070b68f4ac94f1d6d4 100644 (file)
--- a/app/helpers/note_helper.rb
+++ b/app/helpers/note_helper.rb
@@ -1,13 +1,24 @@
 module NoteHelper
-  def note_event(at, by)
+  def note_event(event, at, by)
     if by.nil?
-      I18n.t("browse.note.at_html", :when => friendly_date(at)).html_safe
+      I18n.t("browse.note." + event + "_by_anonymous",
+             :when => friendly_date_ago(at),
+             :exact_time => l(at)).html_safe
     else
-      I18n.t("browse.note.at_by_html", :when => friendly_date(at), :user => note_author(by)).html_safe
+      I18n.t("browse.note." + event + "_by",
+             :when => friendly_date_ago(at),
+             :exact_time => l(at),
+             :user => note_author(by)).html_safe
     end
   end
 
   def note_author(author, link_options = {})
-    link_to h(author.display_name), link_options.merge({:controller => "user", :action => "view", :display_name => author.display_name})
+    if author.nil?
+      ""
+    elsif author.status == "deleted"
+      t("users.no_such_user.deleted")
+    else
+      link_to h(author.display_name), link_options.merge(:controller => "/users", :action => "show", :display_name => author.display_name)
+    end
   end
 end