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

[rails.git] / app / views / changeset_comments / _comment.html.erb

diff --git a/app/views/changeset_comments/_comment.html.erb b/app/views/changeset_comments/_comment.html.erb
index 32a4b9229de1c4e2e039c36c0f75ead908067c39..a312e4f0f06d6e9db68a222bd48fce4b1cc9e543 100644 (file)
--- a/app/views/changeset_comments/_comment.html.erb
+++ b/app/views/changeset_comments/_comment.html.erb
@@ -1,6 +1,7 @@
-<h2><%= t ".comment", :author => comment.author.display_name,
-  :changeset_id => comment.changeset.id.to_s %></h2>
+<h2><%= t ".comment",
+          :author => comment.author.display_name,
+          :changeset_id => comment.changeset.id.to_s %></h2>

 <div class="changeset-comment" style="margin-top: 5px">
 <div class="changeset-comment" style="margin-top: 5px">

-  <div class="changeset-comment-description" style="font-size: smaller; color: #999999"><%= t ".commented_at_by_html", :when => friendly_date(comment.created_at), :user => comment.author.display_name %></div>
+  <div class="changeset-comment-description" style="font-size: smaller; color: #999999"><%= t ".commented_at_by_html", :when => friendly_date_ago(comment.created_at), :user => comment.author.display_name %></div>

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