From e5d8bd539f045db1870a4722290f75b11cf4d2e0 Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 19 Jun 2019 12:09:46 +0200 Subject: [PATCH 1/1] Use friendly_date_ago for user blocks Refs #2255 --- app/views/user_blocks/show.html.erb | 2 +- config/locales/en.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/views/user_blocks/show.html.erb b/app/views/user_blocks/show.html.erb index 28e467fb4..7b34d204a 100644 --- a/app/views/user_blocks/show.html.erb +++ b/app/views/user_blocks/show.html.erb @@ -28,7 +28,7 @@

<% end %> -

<%= t ".created" %>: <%= raw t ".ago", :time => friendly_date(@user_block.created_at) %>

+

<%= t ".created" %>: <%= friendly_date_ago(@user_block.created_at) %>

<%= t ".status" %>: <%= block_status(@user_block) %>

diff --git a/config/locales/en.yml b/config/locales/en.yml index 30f15d806..a88c35382 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2401,7 +2401,6 @@ en: title: "%{block_on} blocked by %{block_by}" heading: "%{block_on} blocked by %{block_by}" created: "Created" - ago: "%{time} ago" status: "Status" show: "Show" edit: "Edit" -- 2.39.5