Merge remote-tracking branch 'upstream/pull/4698'

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

diff --git a/app/helpers/note_helper.rb b/app/helpers/note_helper.rb
index d85881a3111027cb3fe8f5b178deb0fc1acb6486..21c8fa51e8c4326cd37182aeda636b4898c15d20 100644 (file)
--- a/app/helpers/note_helper.rb
+++ b/app/helpers/note_helper.rb
@@ -3,13 +3,11 @@ module NoteHelper
 
   def note_event(event, at, by)
     if by.nil?
-      t("browse.note." + event + "_by_anonymous_html",
-        :when => friendly_date_ago(at),
-        :exact_time => l(at))
+      t("notes.show.event_#{event}_by_anonymous_html",
+        :time_ago => friendly_date_ago(at))
     else
-      t("browse.note." + event + "_by_html",
-        :when => friendly_date_ago(at),
-        :exact_time => l(at),
+      t("notes.show.event_#{event}_by_html",
+        :time_ago => friendly_date_ago(at),
         :user => note_author(by))
     end
   end