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

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

diff --git a/app/helpers/note_helper.rb b/app/helpers/note_helper.rb
index 809480a04020df137e8b7b98e5c32d9da01605bb..42fd089e47ef1105b09a4e1a0c5e024044bd4ab4 100644 (file)
--- a/app/helpers/note_helper.rb
+++ b/app/helpers/note_helper.rb
@@ -3,13 +3,13 @@ module NoteHelper
 
   def note_event(event, at, by)
     if by.nil?
 
   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 => tag.abbr(friendly_date_ago(at),
+                              :title => l(at)))

     else
     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 => tag.abbr(friendly_date_ago(at),
+                              :title => l(at)),

         :user => note_author(by))
     end
   end
         :user => note_author(by))
     end
   end