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

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

diff --git a/app/helpers/note_helper.rb b/app/helpers/note_helper.rb
index baf5a2721f92190292c82057f5b9c456296932c5..dbe0c89f78e0f687f65934070b68f4ac94f1d6d4 100644 (file)
--- a/app/helpers/note_helper.rb
+++ b/app/helpers/note_helper.rb
@@ -2,23 +2,23 @@ module NoteHelper
   def note_event(event, at, by)
     if by.nil?
       I18n.t("browse.note." + event + "_by_anonymous",
   def note_event(event, at, by)
     if by.nil?
       I18n.t("browse.note." + event + "_by_anonymous",

-             :when => friendly_date(at),
-             :exact_time => l(at)
-      ).html_safe
+             :when => friendly_date_ago(at),
+             :exact_time => l(at)).html_safe

     else
       I18n.t("browse.note." + event + "_by",
     else
       I18n.t("browse.note." + event + "_by",

-             :when => friendly_date(at),
+             :when => friendly_date_ago(at),

              :exact_time => l(at),
              :exact_time => l(at),

-             :user => note_author(by)
-      ).html_safe
+             :user => note_author(by)).html_safe

     end
   end
 
   def note_author(author, link_options = {})
     if author.nil?
       ""
     end
   end
 
   def note_author(author, link_options = {})
     if author.nil?
       ""

+    elsif author.status == "deleted"
+      t("users.no_such_user.deleted")

     else
     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
 end
     end
   end
 end