X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2ef58f47a232c8a8156dd148616c198790e489d2..bf9dd8f350ca1b54afb79dda79506d980ccb5738:/app/helpers/note_helper.rb?ds=inline diff --git a/app/helpers/note_helper.rb b/app/helpers/note_helper.rb index bfd7f493d..dbe0c89f7 100644 --- a/app/helpers/note_helper.rb +++ b/app/helpers/note_helper.rb @@ -1,13 +1,24 @@ module NoteHelper - def note_event(at, by) + def note_event(event, at, by) if by.nil? - I18n.t("browse.note.at_html", :when => friendly_date(at)).html_safe + I18n.t("browse.note." + event + "_by_anonymous", + :when => friendly_date_ago(at), + :exact_time => l(at)).html_safe else - I18n.t("browse.note.at_by_html", :when => friendly_date(at), :user => note_author(by)).html_safe + I18n.t("browse.note." + event + "_by", + :when => friendly_date_ago(at), + :exact_time => l(at), + :user => note_author(by)).html_safe end end def note_author(author, link_options = {}) - link_to h(author.display_name), link_options.merge({:controller => "user", :action => "view", :display_name => author.display_name}) + if author.nil? + "" + 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) + end end end