X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/12c1d5e6c05813a0697724277b4d8529a1a7c240..0b7435ab32b3271ae000894f6798cc087b3c058c:/app/views/user_blocks/revoke.html.erb?ds=inline diff --git a/app/views/user_blocks/revoke.html.erb b/app/views/user_blocks/revoke.html.erb index 9a86177fc..224e1e4bb 100644 --- a/app/views/user_blocks/revoke.html.erb +++ b/app/views/user_blocks/revoke.html.erb @@ -4,15 +4,13 @@ <% content_for :heading do %>

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

+ :block_on => link_to(@user_block.user.display_name, @user_block.user), + :block_by => link_to(@user_block.creator.display_name, @user_block.creator)) %> <% end %> <% if @user_block.ends_at > Time.now %>

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

<%= bootstrap_form_for :revoke, :url => { :action => "revoke" } do |f| %> @@ -23,11 +21,11 @@ - <%= f.primary t(".revoke") %> + <%= f.submit t(".revoke"), :class => "btn btn-danger" %> <% end %> <% else %>

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

<% end %>