X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/09c5740b5bb94c75a5c8c83cdbb80ae7b5ccbdf4..ca06b3c7b1a742307e1f6d6b8f809bab2dd0d484:/app/views/user_blocks/revoke.html.erb?ds=sidebyside diff --git a/app/views/user_blocks/revoke.html.erb b/app/views/user_blocks/revoke.html.erb index b1a4dea74..321b145a3 100644 --- a/app/views/user_blocks/revoke.html.erb +++ b/app/views/user_blocks/revoke.html.erb @@ -1,10 +1,10 @@

<%= t('user_block.revoke.heading', :block_on => @user_block.user.display_name, - :block_by => @user_block.moderator.display_name) %>

+ :block_by => @user_block.creator.display_name) %> -<% if @user_block.end_at > Time.now %> +<% if @user_block.ends_at > Time.now %>

- <%= 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)) %>

<% form_for :revoke, :url => { :action => "revoke" } do |f| %> @@ -20,6 +20,6 @@ <% else %>

- <%= 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)) %>

<% end %>