cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use friendly_date helpers for revoking user blocks

Browse source
This commit is contained in:
Andy Allan 2023-11-15 19:44:10 +00:00
parent 100a7f8979
commit bc9c492c48
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/views/user_blocks/revoke.html.erb
View file

@ -12,7 +12,7 @@
<% 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| %>
@ -28,6 +28,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 %>

4
config/locales/en.yml
View file

@ -2844,8 +2844,8 @@ en:
revoke:
title: "Revoking block on %{block_on}"
heading_html: "Revoking block on %{block_on} by %{block_by}"
time_future: "This block will end in %{time}."
past: "This block ended %{time} and cannot be revoked now."
time_future_html: "This block will end in %{time}."
past_html: "This block ended %{time} and cannot be revoked now."
confirm: "Are you sure you wish to revoke this block?"
revoke: "Revoke!"
flash: "This block has been revoked."