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

[rails.git] / app / views / diary_entries / comments.html.erb

diff --git a/app/views/diary_entries/comments.html.erb b/app/views/diary_entries/comments.html.erb
index 290fba35e66a7edd20c9fcce9cb714266af2e69d..e3a7ff23e12f8f8f5baf7012874d8745ff4d2724 100644 (file)
--- a/app/views/diary_entries/comments.html.erb
+++ b/app/views/diary_entries/comments.html.erb
@@ -1,5 +1,6 @@
 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h1><%= t(".has_commented_on", :display_name => @user.display_name) %></h1>
+  <h1><%= t ".heading", :user => @user.display_name %></h1>
+  <p><%= t ".subheading_html", :user => link_to(@user.display_name, user_path(@user)) %></p>

 <% end %>
 
 <% if @comments.empty? %>
 <% end %>
 
 <% if @comments.empty? %>


@@ -17,7 +18,7 @@
     <% @comments.each do |comment| -%>
     <tr class="<%= "text-muted" unless comment.visible? %>">
       <td width="25%"><%= link_to comment.diary_entry.title, diary_entry_path(comment.diary_entry.user, comment.diary_entry) %></td>
     <% @comments.each do |comment| -%>
     <tr class="<%= "text-muted" unless comment.visible? %>">
       <td width="25%"><%= link_to comment.diary_entry.title, diary_entry_path(comment.diary_entry.user, comment.diary_entry) %></td>

-      <td width="25%"><span title="<%= l comment.created_at, :format => :friendly %>"><%= time_ago_in_words(comment.created_at, :scope => :'datetime.distance_in_words_ago') %></span></td>
+      <td width="25%"><span title="<%= l comment.created_at, :format => :friendly %>"><%= time_ago_in_words(comment.created_at, :scope => :"datetime.distance_in_words_ago") %></span></td>

       <td width="50%" class="richtext text-break"><%= comment.body.to_html %></td>
     </tr>
     <% end -%>
       <td width="50%" class="richtext text-break"><%= comment.body.to_html %></td>
     </tr>
     <% end -%>