X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/3b237dc3dabda181ed68dc587b1befc678a03706..02bfc46ab38b86d94aa7617853e69ac6d307fb1e:/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 6f0104cfb..0204908dd 100644 --- a/app/views/user_blocks/show.html.erb +++ b/app/views/user_blocks/show.html.erb @@ -1,36 +1,38 @@ -<% @title = t('.title', +<% @title = t(".title", :block_on => @user_block.user.display_name, :block_by => @user_block.creator.display_name) %> <% content_for :heading do %> -
- <%= t '.revoker' %> - <%= link_to h(@user_block.revoker.display_name), user_path(@user_block.revoker) %> + <%= t ".revoker" %> + <%= link_to @user_block.revoker.display_name, user_path(@user_block.revoker) %>
<% end %> -<%= t '.created' %>: <%= raw t '.ago', :time => friendly_date(@user_block.created_at) %>
+<%= t ".created" %>: <%= friendly_date_ago(@user_block.created_at) %>
-<%= t '.status' %>: <%= block_status(@user_block) %>
+<%= t ".duration" %>: <%= block_duration_in_words(@user_block.ends_at - @user_block.created_at) %>
-<%= t '.reason' %>
-<%= t ".status" %>: <%= block_status(@user_block) %>
+ +<%= t ".reason" %>
+