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

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

diff --git a/app/views/user_blocks/revoke.html.erb b/app/views/user_blocks/revoke.html.erb
index 44da21d85b303f8bf968712888f704440637afed..9bd7df5aed930cfdd81825fc1002aa494e44e785 100644 (file)
--- a/app/views/user_blocks/revoke.html.erb
+++ b/app/views/user_blocks/revoke.html.erb
@@ -28,6 +28,6 @@
 
 <% else %>
 <p>
-  <%= t(".past", :time => distance_of_time_in_words_to_now(@user_block.ends_at)) %>
+  <%= t(".past", :time => time_ago_in_words(@user_block.ends_at, :scope => :'datetime.distance_in_words_ago')) %>
 </p>
 <% end %>