X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/52e5fa6ad78f375cec5a207a123a4aa3939c8ddf..d8a2794c2c0be24cf78945cdbf4af57c4468499c:/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 4ba69a73f..94ea53b64 100644 --- a/app/views/user_blocks/show.html.erb +++ b/app/views/user_blocks/show.html.erb @@ -1,31 +1,38 @@ -<% @title = t('user_block.show.title', +<% @title = t(".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' %> - <%= link_to h(@user_block.revoker.display_name), :controller => 'user', :action => 'view', :display_name => @user_block.revoker.display_name %> -

-<% end %> -

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

+<% content_for :heading do %> +

<%= t(".heading_html", + :block_on => link_to(@user_block.user.display_name, @user_block.user), + :block_by => link_to(@user_block.creator.display_name, @user_block.creator)) %>

+ +<% end %> -

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

-<%= htmlize(@user_block.reason) %> +
+ <% if @user_block.revoker %> +
<%= t ".revoker" %>
+
<%= link_to @user_block.revoker.display_name, @user_block.revoker %>
+ <% end %> -<% if @user_block.ends_at > Time.now.getutc %> -<% if @user and @user.id == @user_block.creator_id %> -<%= link_to t('user_block.show.edit'), edit_user_block_path(@user_block) %> | -<% end %> -<% if @user and @user.moderator? %> -<%= link_to(t('user_block.show.revoke'),{:controller => 'user_blocks', :action => 'revoke', :id => @user_block.id}) %> | -<% end %> -<% end %> -<%= link_to t('user_block.show.back'), user_blocks_path %> +
<%= t ".created" %>
+
<%= friendly_date_ago(@user_block.created_at) %>
+
<%= t ".duration" %>
+
<%= block_duration_in_words(@user_block.ends_at - @user_block.created_at) %>
+
<%= t ".status" %>
+
<%= block_status(@user_block) %>
+
<%= t ".reason" %>
+
<%= @user_block.reason.to_html %>
+