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

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

diff --git a/app/helpers/note_helper.rb b/app/helpers/note_helper.rb
index 2eb809572cd51be66eaae9a62d859d30e671a313..89c8cc376a24b7eadaa2b042be51e845306a9b62 100644 (file)
--- a/app/helpers/note_helper.rb
+++ b/app/helpers/note_helper.rb
@@ -3,14 +3,12 @@ module NoteHelper
     if by.nil?
       I18n.t("browse.note." + event + "_by_anonymous",
              :when => friendly_date(at),
-             :exact_time => l(at)
-            ).html_safe
+             :exact_time => l(at)).html_safe
     else
       I18n.t("browse.note." + event + "_by",
              :when => friendly_date(at),
              :exact_time => l(at),
-             :user => note_author(by)
-            ).html_safe
+             :user => note_author(by)).html_safe
     end
   end
 
@@ -18,9 +16,9 @@ module NoteHelper
     if author.nil?
       ""
     elsif author.status == "deleted"
-      t("browse.anonymous")
+      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
 end