X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/09c5740b5bb94c75a5c8c83cdbb80ae7b5ccbdf4..22dc13d6edb17cbdd4b73aabad340dcc8ef41999:/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 f8e8b523e..03bcd3036 100644 --- a/app/views/user_blocks/show.html.erb +++ b/app/views/user_blocks/show.html.erb @@ -1,38 +1,40 @@ -

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

+<% @title = t(".title", + :block_on => @user_block.user.display_name, + :block_by => @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 %> -

+<% content_for :heading do %> +

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

+ <% end %> -

- <% if @user_block.end_at > Time.now %> - <%= t('user_block.show.time_future', :time => distance_of_time_in_words_to_now(@user_block.end_at)) %> - <% else %> - <%= t('user_block.show.time_past', :time => distance_of_time_in_words_to_now(@user_block.end_at)) %> +

+ <% if @user_block.revoker %> +
<%= t ".revoker" %>
+
<%= link_to @user_block.revoker.display_name, user_path(@user_block.revoker) %>
<% end %> -

-<% if @user_block.needs_view %> -

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

-<% end %> - -

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

- - -<% if @user_block.end_at > Time.now.getutc %> -<% if @user and @user.id == @user_block.moderator_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 %>
+