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

[rails.git] / app / views / api / notes / _comment.html.erb

diff --git a/app/views/api/notes/_comment.html.erb b/app/views/api/notes/_comment.html.erb
index d9c17848b26995f00abbd91f9e4fca25b943db84..f599eec1417366d78f0cb6f8d173e6798789d998 100644 (file)
--- a/app/views/api/notes/_comment.html.erb
+++ b/app/views/api/notes/_comment.html.erb
@@ -1,8 +1,8 @@
 <div class="note-comment" style="margin-top: 5px">
   <% if comment.author.nil? -%>
 <div class="note-comment" style="margin-top: 5px">
   <% if comment.author.nil? -%>

-  <div class="note-comment-description" style="font-size: smaller; color: #999999"><%= t ".#{comment.event}_at_html", :when => friendly_date(comment.created_at) %></div>
+  <div class="note-comment-description" style="font-size: smaller; color: #999999"><%= t ".#{comment.event}_at_html", :when => friendly_date_ago(comment.created_at) %></div>

   <% else -%>
   <% else -%>

-  <div class="note-comment-description" style="font-size: smaller; color: #999999"><%= t ".#{comment.event}_at_by_html", :when => friendly_date(comment.created_at), :user => note_author(comment.author, :only_path => false) %></div>
+  <div class="note-comment-description" style="font-size: smaller; color: #999999"><%= t ".#{comment.event}_at_by_html", :when => friendly_date_ago(comment.created_at), :user => note_author(comment.author, :only_path => false) %></div>

   <% end -%>
   <div class="note-comment-text"><%= comment.body %></div>
 </div>
   <% end -%>
   <div class="note-comment-text"><%= comment.body %></div>
 </div>