X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/68a3df4d53c84508bf443058040379c3a18eb1a7..d3b67140313c26ad431c67ab1d56203aa41f77c7:/app/helpers/note_helper.rb

diff --git a/app/helpers/note_helper.rb b/app/helpers/note_helper.rb
index e0eef269b..42fd089e4 100644
--- a/app/helpers/note_helper.rb
+++ b/app/helpers/note_helper.rb
@@ -1,25 +1,31 @@
 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 => tag.abbr(friendly_date_ago(at),
+                              :title => l(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 => tag.abbr(friendly_date_ago(at),
+                              :title => l(at)),
+        :user => note_author(by))
     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
 
+  def disappear_in(note)
+    date = note.freshly_closed_until
+    tag.span(distance_of_time_in_words(date, Time.now.utc), :title => l(date, :format => :friendly))
+  end
 end