X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d739943b36901ed30d8a715e113fb0a34b14d2e4..00c0a943eada2301726db0f2ef9974691dd84ad9:/app/helpers/note_helper.rb?ds=sidebyside diff --git a/app/helpers/note_helper.rb b/app/helpers/note_helper.rb index 4e7e37bfb..7a75a4ff5 100644 --- a/app/helpers/note_helper.rb +++ b/app/helpers/note_helper.rb @@ -1,6 +1,16 @@ module NoteHelper include ActionView::Helpers::TranslationHelper + def note_description(author, description, first_comment) + if !author.nil? && author.status == "deleted" + RichText.new("text", t("notes.show.description_when_author_is_deleted")) + elsif first_comment&.event != "opened" + RichText.new("text", t("notes.show.description_when_there_is_no_opening_comment")) + else + description + end + end + def note_event(event, at, by) if by.nil? t("notes.show.event_#{event}_by_anonymous_html", @@ -18,12 +28,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