Use lazy lookups and rename translation keys for export

[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..51fbcaf49e2ba1f3e9e12e10c49dd13d96ea5ff8 100644 (file)
--- a/app/views/user_blocks/show.html.erb
+++ b/app/views/user_blocks/show.html.erb
@@ -6,10 +6,10 @@
   <h1><%= raw t('user_block.show.heading',
                 :block_on => link_to(
                                      h(@user_block.user.display_name),
   <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}),
+                                     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),

-                                     {:controller => 'user', :action => 'view', :display_name => @user_block.creator.display_name})) %></h1>
+                                     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 %>
 <ul class='secondary-actions clearfix'>
   <% if @user_block.ends_at > Time.now.getutc %>
     <% if current_user and current_user.id == @user_block.creator_id %>


@@ -26,7 +26,7 @@
 <% if @user_block.revoker %>
 <p>
   <b><%= t'user_block.show.revoker' %></b>
 <% 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 %>
+  <%= link_to h(@user_block.revoker.display_name), user_path(@user_block.revoker) %>

 </p>
 <% end %>
 
 </p>
 <% end %>