New migration to add better auditing to user_roles and better column names there...

[rails.git] / app / views / user_blocks / revoke.html.erb

diff --git a/app/views/user_blocks/revoke.html.erb b/app/views/user_blocks/revoke.html.erb
index b1a4dea7470dfe189148dbc2ef82030f8d7ec73b..321b145a3907ca39c66911b06f555f42f9a470c8 100644 (file)
--- a/app/views/user_blocks/revoke.html.erb
+++ b/app/views/user_blocks/revoke.html.erb
@@ -1,10 +1,10 @@
 <h1><%= t('user_block.revoke.heading', 
        :block_on => @user_block.user.display_name, 
 <h1><%= t('user_block.revoke.heading', 
        :block_on => @user_block.user.display_name, 

-        :block_by => @user_block.moderator.display_name) %></h1>
+        :block_by => @user_block.creator.display_name) %></h1>

 
 

-<% if @user_block.end_at > Time.now %>
+<% if @user_block.ends_at > Time.now %>

 <p><b>
 <p><b>

-  <%= t('user_block.revoke.time_future', :time => distance_of_time_in_words_to_now(@user_block.end_at)) %>
+  <%= t('user_block.revoke.time_future', :time => distance_of_time_in_words_to_now(@user_block.ends_at)) %>

 </b></p>
 
 <% form_for :revoke, :url => { :action => "revoke" } do |f| %>
 </b></p>
 
 <% form_for :revoke, :url => { :action => "revoke" } do |f| %>


@@ -20,6 +20,6 @@
 
 <% else %>
 <p>
 
 <% else %>
 <p>

-  <%= t('user_block.revoke.past', :time => distance_of_time_in_words_to_now(@user_block.end_at)) %>
+  <%= t('user_block.revoke.past', :time => distance_of_time_in_words_to_now(@user_block.ends_at)) %>

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