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

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

diff --git a/app/helpers/note_helper.rb b/app/helpers/note_helper.rb
index d85881a3111027cb3fe8f5b178deb0fc1acb6486..0ba5032288b7c7b7ebb9803a00fc230506372775 100644 (file)
--- a/app/helpers/note_helper.rb
+++ b/app/helpers/note_helper.rb
@@ -1,15 +1,21 @@
 module NoteHelper
   include ActionView::Helpers::TranslationHelper
 
+  def note_description(author, description)
+    if !author.nil? && author.status == "deleted"
+      RichText.new("text", t("notes.show.description_when_author_is_deleted"))
+    else
+      description
+    end
+  end
+
   def note_event(event, at, by)
     if by.nil?
-      t("browse.note." + event + "_by_anonymous_html",
-        :when => friendly_date_ago(at),
-        :exact_time => l(at))
+      t("notes.show.event_#{event}_by_anonymous_html",
+        :time_ago => friendly_date_ago(at))
     else
-      t("browse.note." + event + "_by_html",
-        :when => friendly_date_ago(at),
-        :exact_time => l(at),
+      t("notes.show.event_#{event}_by_html",
+        :time_ago => friendly_date_ago(at),
         :user => note_author(by))
     end
   end
@@ -20,7 +26,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