X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/a36f3558dd43dd5a598e36dd21fd5f7d2b4a94f5..6db326aa1f084a062a3b658876bc01bf650f5702:/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 73b26b930..28e467fb4 100644
--- a/app/views/user_blocks/show.html.erb
+++ b/app/views/user_blocks/show.html.erb
@@ -1,36 +1,36 @@
-<% @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><%= 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),
+                                     user_path(@user_block.creator))) %></h1>
 <ul class='secondary-actions clearfix'>
   <% if @user_block.ends_at > Time.now.getutc %>
-    <% if @user and @user.id == @user_block.creator_id %>
-      <li><%= link_to t('user_block.show.edit'), edit_user_block_path(@user_block) %></li>
+    <% if current_user and current_user.id == @user_block.creator_id %>
+      <li><%= link_to t(".edit"), edit_user_block_path(@user_block) %></li>
     <% end %>
-    <% if @user and @user.moderator? %>
-      <li><%= link_to(t('user_block.show.revoke'),{:controller => 'user_blocks', :action => 'revoke', :id => @user_block.id}) %></li>
+    <% if current_user and current_user.moderator? %>
+      <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 h(@user_block.revoker.display_name), user_path(@user_block.revoker) %>
 </p>
 <% end %>
 
-<p><b><%= t'user_block.show.status' %></b>: <%= block_status(@user_block) %></p>
+<p><b><%= t ".created" %></b>: <%= raw t ".ago", :time => friendly_date(@user_block.created_at) %></p>
 
-<p><b><%= t'user_block.show.reason' %></b></p>
-<%= @user_block.reason.to_html %>
\ No newline at end of file
+<p><b><%= t ".status" %></b>: <%= block_status(@user_block) %></p>
+
+<p><b><%= t ".reason" %></b></p>
+<div class="richtext"><%= @user_block.reason.to_html %></div>