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

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

diff --git a/app/helpers/note_helper.rb b/app/helpers/note_helper.rb
index 6ebd18345526e186833527454e72895065c36539..89c8cc376a24b7eadaa2b042be51e845306a9b62 100644 (file)
--- a/app/helpers/note_helper.rb
+++ b/app/helpers/note_helper.rb
@@ -16,9 +16,9 @@ module NoteHelper
     if author.nil?
       ""
     elsif author.status == "deleted"
     if author.nil?
       ""
     elsif author.status == "deleted"

-      t("user.no_such_user.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