X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3c6453a3917174547e7896d5810550b3a99563ab..eee793f5e6e534442793c88f06caca2ccb5c12d1:/app/helpers/note_helper.rb diff --git a/app/helpers/note_helper.rb b/app/helpers/note_helper.rb index 42fd089e4..0ba503228 100644 --- 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("notes.show.event_#{event}_by_anonymous_html", - :time_ago => tag.abbr(friendly_date_ago(at), - :title => l(at))) + :time_ago => friendly_date_ago(at)) else t("notes.show.event_#{event}_by_html", - :time_ago => tag.abbr(friendly_date_ago(at), - :title => l(at)), + :time_ago => friendly_date_ago(at), :user => note_author(by)) end end @@ -20,12 +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 - - 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