X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/66b5e85845547e6f3c6dba59952217f5882b0271..4dcbe9e0a9d8b2d8f580a5bd19fa19f81d3fef27:/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 1899e5145..6bf87c4c3 100644
--- a/app/views/user_blocks/revoke.html.erb
+++ b/app/views/user_blocks/revoke.html.erb
@@ -4,19 +4,17 @@
 
 <% content_for :heading do %>
   <h1><%= t(".heading_html",
-            :block_on => link_to(@user_block.user.display_name,
-                                 user_path(@user_block.user)),
-            :block_by => link_to(@user_block.creator.display_name,
-                                 user_path(@user_block.creator))) %></h1>
+            :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>
-    <%= t(".time_future", :time => distance_of_time_in_words_to_now(@user_block.ends_at)) %>
+    <%= t(".time_future_html", :time => friendly_date(@user_block.ends_at)) %>
   </p>
 
   <%= bootstrap_form_for :revoke, :url => { :action => "revoke" } do |f| %>
-    <div class="form-group">
+    <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" } %>
@@ -28,6 +26,6 @@
 
 <% else %>
   <p>
-    <%= t(".past", :time => time_ago_in_words(@user_block.ends_at, :scope => :'datetime.distance_in_words_ago')) %>
+    <%= t(".past_html", :time => friendly_date_ago(@user_block.ends_at)) %>
   </p>
 <% end %>