From 54e0c7afb2b380a869097a3df826bb860248bb47 Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 19 Jun 2019 11:44:29 +0200 Subject: [PATCH] Use distance_in_words_ago scope for user blocks Refs #2255 --- app/views/user_blocks/revoke.html.erb | 2 +- config/locales/en.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/user_blocks/revoke.html.erb b/app/views/user_blocks/revoke.html.erb index 44da21d85..9bd7df5ae 100644 --- a/app/views/user_blocks/revoke.html.erb +++ b/app/views/user_blocks/revoke.html.erb @@ -28,6 +28,6 @@ <% else %>

- <%= t(".past", :time => distance_of_time_in_words_to_now(@user_block.ends_at)) %> + <%= t(".past", :time => time_ago_in_words(@user_block.ends_at, :scope => :'datetime.distance_in_words_ago')) %>

<% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 897e5f7c0..f49f05746 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2364,7 +2364,7 @@ en: title: "Revoking block on %{block_on}" heading: "Revoking block on %{block_on} by %{block_by}" time_future: "This block will end in %{time}." - past: "This block ended %{time} ago and cannot be revoked now." + past: "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." -- 2.39.5