X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a0de9b780db50a1a92616fe03358248412864025..6c22bf4b9afb26af56430ec9f9e191502fb0ee60:/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 4dc03f4e4..7e225bf14 100644
--- a/app/views/user_blocks/show.html.erb
+++ b/app/views/user_blocks/show.html.erb
@@ -1,38 +1,36 @@
-<% @title = t('.title',
+<% @title = t(".title",
:block_on => @user_block.user.display_name,
:block_by => @user_block.creator.display_name) %>
<% content_for :heading do %>
-
<%= raw t('.heading',
- :block_on => link_to(
- h(@user_block.user.display_name),
+ <%= raw t(".heading",
+ :block_on => link_to(h(@user_block.user.display_name),
user_path(@user_block.user)),
- :block_by => link_to(
- h(@user_block.creator.display_name),
+ :block_by => link_to(h(@user_block.creator.display_name),
user_path(@user_block.creator))) %>
<% if @user_block.ends_at > Time.now.getutc %>
<% if current_user and current_user.id == @user_block.creator_id %>
- - <%= link_to t('.edit'), edit_user_block_path(@user_block) %>
+ - <%= link_to t(".edit"), edit_user_block_path(@user_block) %>
<% end %>
- <% if current_user and current_user.moderator? %>
- - <%= link_to(t('.revoke'),{:controller => 'user_blocks', :action => 'revoke', :id => @user_block.id}) %>
+ <% if can?(:revoke, UserBlock) %>
+ - <%= link_to(t(".revoke"), :controller => "user_blocks", :action => "revoke", :id => @user_block.id) %>
<% end %>
<% end %>
- - <%= link_to t('.back'), user_blocks_path %>
+ - <%= link_to t(".back"), user_blocks_path %>
<% end %>
<% if @user_block.revoker %>
- <%= t'.revoker' %>
+ <%= t ".revoker" %>
<%= link_to h(@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 ".status" %>: <%= block_status(@user_block) %>
-<%= t'.reason' %>
+<%= t ".reason" %>
<%= @user_block.reason.to_html %>