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

[rails.git] / app / views / user_blocks / show.html.erb

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><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>