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

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

diff --git a/app/helpers/note_helper.rb b/app/helpers/note_helper.rb
index 87bd86f428e4edd7e1e821d84a9840694c8758c7..21c8fa51e8c4326cd37182aeda636b4898c15d20 100644 (file)
--- a/app/helpers/note_helper.rb
+++ b/app/helpers/note_helper.rb
@@ -1,24 +1,24 @@
 module NoteHelper
 module NoteHelper

+  include ActionView::Helpers::TranslationHelper
+

   def note_event(event, at, by)
     if by.nil?
   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
+      t("notes.show.event_#{event}_by_anonymous_html",
+        :time_ago => friendly_date_ago(at))

     else
     else

-      I18n.t("browse.note." + event + "_by",
-             :when => friendly_date(at),
-             :exact_time => l(at),
-             :user => note_author(by)
-            ).html_safe
+      t("notes.show.event_#{event}_by_html",
+        :time_ago => friendly_date_ago(at),
+        :user => note_author(by))

     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