Use friendly_date_ago for user blocks

Refs #2255

diff --git a/app/views/user_blocks/show.html.erb b/app/views/user_blocks/show.html.erb
index 28e467fb4ebc84b376b53da39f6f4e7332f77701..7b34d204a96c3edbb5a0ab2b55944be7d647aaa6 100644 (file)
--- a/app/views/user_blocks/show.html.erb
+++ b/app/views/user_blocks/show.html.erb
@@ -28,7 +28,7 @@
 </p>
 <% end %>
 
 </p>
 <% end %>
 

-<p><b><%= t ".created" %></b>: <%= raw t ".ago", :time => friendly_date(@user_block.created_at) %></p>
+<p><b><%= t ".created" %></b>: <%= friendly_date_ago(@user_block.created_at) %></p>

 
 <p><b><%= t ".status" %></b>: <%= block_status(@user_block) %></p>
 
 
 <p><b><%= t ".status" %></b>: <%= block_status(@user_block) %></p>
 

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 30f15d806d11874f5d814857f8787a5107449223..a88c3538260698d672a50547ac29d30bc9da872c 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2401,7 +2401,6 @@ en:
       title: "%{block_on} blocked by %{block_by}"
       heading: "%{block_on} blocked by %{block_by}"
       created: "Created"
       title: "%{block_on} blocked by %{block_by}"
       heading: "%{block_on} blocked by %{block_by}"
       created: "Created"

-      ago: "%{time} ago"

       status: "Status"
       show: "Show"
       edit: "Edit"
       status: "Status"
       show: "Show"
       edit: "Edit"