X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/70cca71f3802519eac1fabaeb3ee1cc9f35f5cb7..973d62a25ebf22bf80663a8b6996f0dbe7d5289f:/app/helpers/note_helper.rb diff --git a/app/helpers/note_helper.rb b/app/helpers/note_helper.rb index efe2346c9..21c8fa51e 100644 --- a/app/helpers/note_helper.rb +++ b/app/helpers/note_helper.rb @@ -1,14 +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 @@ -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 => "show", :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