Show the crafted duration of a block independent of the reading time

[rails.git] / 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 cc0caa6f3f2d44590c0e39d5e83e4a517d00b60c..1b5609e25b32130e2e80d9f9b69a5c6397ce242c 100644 (file)
--- a/app/views/user_blocks/show.html.erb
+++ b/app/views/user_blocks/show.html.erb
@@ -1,38 +1,39 @@
-<% @title = t('user_block.show.title',
+<% @title = t(".title",
               :block_on => @user_block.user.display_name,
               :block_by => @user_block.creator.display_name) %>
 
 <% content_for :heading do %>
-  <h1><%= 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})) %></h1>
+  <h1><%= 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))) %></h1>
 <ul class='secondary-actions clearfix'>
   <% if @user_block.ends_at > Time.now.getutc %>
     <% if current_user and current_user.id == @user_block.creator_id %>
-      <li><%= link_to t('user_block.show.edit'), edit_user_block_path(@user_block) %></li>
+      <li><%= link_to t(".edit"), edit_user_block_path(@user_block) %></li>
     <% end %>
-    <% if current_user and current_user.moderator? %>
-      <li><%= link_to(t('user_block.show.revoke'),{:controller => 'user_blocks', :action => 'revoke', :id => @user_block.id}) %></li>
+    <% if can?(:revoke, UserBlock) %>
+      <li><%= link_to(t(".revoke"), :controller => "user_blocks", :action => "revoke", :id => @user_block.id) %></li>
     <% end %>
   <% end %>
-  <li><%= link_to t('user_block.show.back'), user_blocks_path %></li>
+  <li><%= link_to t(".back"), user_blocks_path %></li>
 </ul>
 <% end %>
 
 <% if @user_block.revoker %>
 <p>
-  <b><%= t'user_block.show.revoker' %></b>
-  <%= link_to h(@user_block.revoker.display_name), :controller => 'user', :action => 'view', :display_name => @user_block.revoker.display_name %>
+  <b><%= t ".revoker" %></b>
+  <%= link_to @user_block.revoker.display_name, user_path(@user_block.revoker) %>
 </p>
 <% end %>
 
-<p><b><%= t'user_block.show.created' %></b>: <%= raw t'user_block.show.ago', :time => friendly_date(@user_block.created_at) %></p>
+<p>
+  <b><%= t ".created" %></b>: <%= friendly_date_ago(@user_block.created_at) %>
+  (<%= block_duration_in_words(@user_block.ends_at - @user_block.created_at) %>)
+</p>
 
-<p><b><%= t'user_block.show.status' %></b>: <%= block_status(@user_block) %></p>
+<p><b><%= t ".status" %></b>: <%= block_status(@user_block) %></p>
 
-<p><b><%= t'user_block.show.reason' %></b></p>
-<div class="richtext"><%= @user_block.reason.to_html %></div>
+<p><b><%= t ".reason" %></b></p>
+<div class="richtext text-break"><%= @user_block.reason.to_html %></div>