-<% @title = t('user_block.revoke.title',
- :block_on => h(@user_block.user.display_name),
- :block_by => h(@user_block.creator.display_name)) %>
-<h1><%= raw t('user_block.revoke.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>
+<% @title = t(".title",
+ :block_on => @user_block.user.display_name,
+ :block_by => @user_block.creator.display_name) %>
+
+<% content_for :heading do %>
+ <h1><%= t(".heading_html",
+ :block_on => link_to(@user_block.user.display_name, @user_block.user),
+ :block_by => link_to(@user_block.creator.display_name, @user_block.creator)) %></h1>
+<% end %>
<% if @user_block.ends_at > Time.now %>
-<p><b>
- <%= t('user_block.revoke.time_future', :time => distance_of_time_in_words_to_now(@user_block.ends_at)) %>
-</b></p>
+ <p>
+ <%= t(".time_future_html", :time => friendly_date(@user_block.ends_at)) %>
+ </p>
-<%= form_for :revoke, :url => { :action => "revoke" } do |f| %>
- <%= f.error_messages %>
-<p>
- <%= check_box_tag 'confirm', 'yes' %>
- <%= label_tag 'confirm', t('user_block.revoke.confirm') %>
-</p>
-<p>
- <%= submit_tag t('user_block.revoke.revoke') %>
-</p>
-<% end %>
+ <%= bootstrap_form_for :revoke, :url => { :action => "revoke" } do |f| %>
+ <div class="mb-3">
+ <div class="form-check">
+ <%= check_box_tag "confirm", "yes", false, { :class => "form-check-input" } %>
+ <%= label_tag "confirm", t(".confirm"), { :class => "form-check-label" } %>
+ </div>
+ </div>
+
+ <%= f.primary t(".revoke") %>
+ <% end %>
<% else %>
-<p>
- <%= t('user_block.revoke.past', :time => distance_of_time_in_words_to_now(@user_block.ends_at)) %>
-</p>
+ <p>
+ <%= t(".past_html", :time => friendly_date_ago(@user_block.ends_at)) %>
+ </p>
<% end %>