tidier code

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

diff --git a/app/helpers/note_helper.rb b/app/helpers/note_helper.rb
index f2bff861f7209ae4f47504579efbec546430b8c3..87bd86f428e4edd7e1e821d84a9840694c8758c7 100644 (file)
--- a/app/helpers/note_helper.rb
+++ b/app/helpers/note_helper.rb
@@ -1,9 +1,16 @@
 module NoteHelper
 module NoteHelper

-  def note_event(at, by)
+  def note_event(event, at, by)

     if by.nil?
     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
     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
 
     end
   end
 


@@ -11,7 +18,7 @@ module NoteHelper
     if author.nil?
       ""
     else
     if author.nil?
       ""
     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 => "user", :action => "view", :display_name => author.display_name)

     end
   end
 end
     end
   end
 end