Merge pull request #3691 from AntonKhorev/wikipedia-secondary-links

[rails.git] / app / helpers / note_helper.rb

diff --git a/app/helpers/note_helper.rb b/app/helpers/note_helper.rb
index e0eef269b4f3185cfd72960bddc5723b57db5d34..86e5c40f8d3d8bb3427814a55f93ac84d65bcb37 100644 (file)
--- 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}_by_anonymous_html",
+        :when => friendly_date_ago(at),
+        :exact_time => l(at))
     else
-      I18n.t("browse.note." + event + "_by",
-        :when => friendly_date(at),
+      t("notes.show.#{event}_by_html",
+        :when => friendly_date_ago(at),
         :exact_time => l(at),
-        :user => note_author(by)
-      ).html_safe
+        :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