X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/eb0f9ff63d5ad5d91ea941420e094dd2980df094..bd8713f42b4a5196cf89e8270c57322742ba1f5e:/app/views/user_blocks/show.html.erb?ds=sidebyside diff --git a/app/views/user_blocks/show.html.erb b/app/views/user_blocks/show.html.erb index 24a1d1e66..2311541d9 100644 --- a/app/views/user_blocks/show.html.erb +++ b/app/views/user_blocks/show.html.erb @@ -1,13 +1,13 @@ <% @title = t('user_block.show.title', :block_on => @user_block.user.display_name, :block_by => @user_block.creator.display_name) %> -

<%= 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})) %>

+

<%= 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' %> @@ -17,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 %>