X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/ca06b3c7b1a742307e1f6d6b8f809bab2dd0d484..67182f824e9ace7d5f6d40691e2d3d120b8fbfea:/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 a1123e21e..2311541d9 100644 --- a/app/views/user_blocks/show.html.erb +++ b/app/views/user_blocks/show.html.erb @@ -1,7 +1,13 @@ -

<%= t('user_block.show.heading', - :block_on => @user_block.user.display_name, - :block_by => @user_block.creator.display_name) %>

- +<% @title = t('user_block.show.title', + :block_on => @user_block.user.display_name, + :block_by => @user_block.creator.display_name) %> +

<%= raw t('user_block.show.heading', + :block_on => link_to( + h(@user_block.user.display_name), + {:controller => 'user', :action => 'view', :display_name => @user_block.user.display_name}), + :block_by => link_to( + h(@user_block.creator.display_name), + {:controller => 'user', :action => 'view', :display_name => @user_block.creator.display_name})) %>

<% if @user_block.revoker %>

<%= t'user_block.show.revoker' %> @@ -11,11 +17,8 @@

<%= t'user_block.show.status' %>: <%= block_status(@user_block) %>

-

- <%= t'user_block.show.reason' %> - <%=h @user_block.reason %> -

- +

<%= t'user_block.show.reason' %>

+<%= @user_block.reason.to_html %> <% if @user_block.ends_at > Time.now.getutc %> <% if @user and @user.id == @user_block.creator_id %>