X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/dae3dcf87edcfc0648cd0b93b069b0eee67d3ab7..bf9dd8f350ca1b54afb79dda79506d980ccb5738:/app/helpers/note_helper.rb?ds=inline diff --git a/app/helpers/note_helper.rb b/app/helpers/note_helper.rb index 6ebd18345..dbe0c89f7 100644 --- a/app/helpers/note_helper.rb +++ b/app/helpers/note_helper.rb @@ -2,11 +2,11 @@ module NoteHelper def note_event(event, at, by) if by.nil? I18n.t("browse.note." + event + "_by_anonymous", - :when => friendly_date(at), + :when => friendly_date_ago(at), :exact_time => l(at)).html_safe else I18n.t("browse.note." + event + "_by", - :when => friendly_date(at), + :when => friendly_date_ago(at), :exact_time => l(at), :user => note_author(by)).html_safe end @@ -16,9 +16,9 @@ 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) end end end