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

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

diff --git a/app/helpers/note_helper.rb b/app/helpers/note_helper.rb
index 809480a04020df137e8b7b98e5c32d9da01605bb..2e9850aef060f2b6549de5cdecac599d95fbdd9a 100644 (file)
--- a/app/helpers/note_helper.rb
+++ b/app/helpers/note_helper.rb
@@ -3,13 +3,11 @@ module NoteHelper
 
   def note_event(event, at, by)
     if by.nil?
 
   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
     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
         :user => note_author(by))
     end
   end


@@ -20,12 +18,8 @@ module NoteHelper
     elsif author.status == "deleted"
       t("users.no_such_user.deleted")
     else
     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
   end

-
-  def disappear_in(note)
-    date = note.freshly_closed_until
-    tag.span(distance_of_time_in_words(date, Time.now.utc), :title => l(date, :format => :friendly))
-  end

 end
 end