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

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

diff --git a/app/helpers/note_helper.rb b/app/helpers/note_helper.rb
index 4b5be42d78b8786988be869e4dc5d2b5ca3c1901..2e9850aef060f2b6549de5cdecac599d95fbdd9a 100644 (file)
--- a/app/helpers/note_helper.rb
+++ b/app/helpers/note_helper.rb
@@ -1,14 +1,14 @@
 module NoteHelper
+  include ActionView::Helpers::TranslationHelper
+
   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
-      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
 
@@ -18,7 +18,8 @@ module NoteHelper
     elsif author.status == "deleted"
       t("users.no_such_user.deleted")
     else
-      link_to h(author.display_name), link_options.merge(:controller => "/users", :action => "show", :display_name => author.display_name)
+      link_to h(author.display_name), link_options.merge(:controller => "/users", :action => "show", :display_name => author.display_name),
+              :class => "mw-100 d-inline-block align-bottom text-truncate text-wrap", :dir => "auto"
     end
   end
 end