Merge branch 'master' into overpass

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

diff --git a/app/helpers/note_helper.rb b/app/helpers/note_helper.rb
index f2bff861f7209ae4f47504579efbec546430b8c3..e0eef269b4f3185cfd72960bddc5723b57db5d34 100644 (file)
--- a/app/helpers/note_helper.rb
+++ b/app/helpers/note_helper.rb
@@ -1,9 +1,16 @@
 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(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(at),
+        :exact_time => l(at),
+        :user => note_author(by)
+      ).html_safe
     end
   end
 
@@ -14,4 +21,5 @@ module NoteHelper
       link_to h(author.display_name), link_options.merge({:controller => "user", :action => "view", :display_name => author.display_name})
     end
   end
+
 end