Use the distance_in_words_ago scope for diary comments pages

Refs #2255

diff --git a/app/views/diary_entries/comments.html.erb b/app/views/diary_entries/comments.html.erb
index 4c4fd01e9f0efa03003b877932e9e1fd9e78e3d0..10028bdea2b6c3643028282c0d37bf2c127cf681 100644 (file)
--- a/app/views/diary_entries/comments.html.erb
+++ b/app/views/diary_entries/comments.html.erb
@@ -12,7 +12,7 @@
   <% cl = cycle("table0", "table1") %>
   <tr class="<%= cl %>">
     <td width="25%"><%= link_to comment.diary_entry.title, diary_entry_path(comment.diary_entry.user, comment.diary_entry) %></td>
   <% cl = cycle("table0", "table1") %>
   <tr class="<%= cl %>">
     <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 %>"><%= t ".ago", :ago => time_ago_in_words(comment.created_at) %></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"><%= comment.body.to_html %></td>
   </tr>
   <% end -%>
     <td width="50%" class="richtext"><%= comment.body.to_html %></td>
   </tr>
   <% end -%>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 83aadc92c3e3fd67a9d433c6e9d58093176cf508..8aa34081ad89ff54c37c0852ec2818741ef64f08 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -415,7 +415,6 @@ en:
       post: Post
       when: When
       comment: Comment
       post: Post
       when: When
       comment: Comment

-      ago: "%{ago} ago"

       newer_comments: "Newer Comments"
       older_comments: "Older Comments"
   geocoder:
       newer_comments: "Newer Comments"
       older_comments: "Older Comments"
   geocoder: