X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/860887de5272c3e2a39cb7e0c9db6f0acba1b4c6..325deabc916acab952089a4b093fa6bafa66083c:/app/helpers/note_helper.rb diff --git a/app/helpers/note_helper.rb b/app/helpers/note_helper.rb index 2a1016129..2e9850aef 100644 --- a/app/helpers/note_helper.rb +++ b/app/helpers/note_helper.rb @@ -1,16 +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,9 +16,10 @@ module NoteHelper if author.nil? "" elsif author.status == "deleted" - t("user.no_such_user.deleted") + t("users.no_such_user.deleted") else - link_to h(author.display_name), link_options.merge(:controller => "user", :action => "view", :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