X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7f598ab412674ce5a78da98c54aa2fe2e4a05792..61c3d97a8ad2891bef0a2eeaa0d60e625b6c2ef2:/app/helpers/note_helper.rb?ds=sidebyside

diff --git a/app/helpers/note_helper.rb b/app/helpers/note_helper.rb
index f2bff861f..dbe0c89f7 100644
--- a/app/helpers/note_helper.rb
+++ b/app/helpers/note_helper.rb
@@ -1,17 +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 = {})
     if author.nil?
       ""
+    elsif author.status == "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