Update to rails 6.1.4.2

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

diff --git a/app/helpers/note_helper.rb b/app/helpers/note_helper.rb
index 6ebd18345526e186833527454e72895065c36539..7e52937a008f94903a9e2c9fe57ea2c3e541f275 100644 (file)
--- a/app/helpers/note_helper.rb
+++ b/app/helpers/note_helper.rb
@@ -1,14 +1,16 @@
 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("browse.note.#{event}_by_anonymous_html",
+        :when => friendly_date_ago(at),
+        :exact_time => l(at))

     else
     else

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

     end
   end
 
     end
   end
 


@@ -16,9 +18,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