From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 19 Jun 2019 09:34:29 +0000 (+0200)
Subject: Use scope for time_ago when viewing users
X-Git-Tag: live~3063^2~10
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/47e653ffe021339ff19b767cfa0c87a508687781

Use scope for time_ago when viewing users

Refs #2255.

Also removes unused translation referencing ago, that was unneeded
after cbf71f04c244440f82d86e12758a2e443f68c0f8
---

diff --git a/app/views/users/_contact.html.erb b/app/views/users/_contact.html.erb
index 9950da0f8..1479a1e4f 100644
--- a/app/views/users/_contact.html.erb
+++ b/app/views/users/_contact.html.erb
@@ -21,7 +21,7 @@
     <p>
       <% changeset = contact.changesets.first %>
       <% if changeset %>
-        <%= t("users.show.latest edit", :ago => t("users.show.ago", :time_in_words_ago => time_ago_in_words(changeset.created_at))) %>
+        <%= t("users.show.latest edit", :ago => time_ago_in_words(changeset.created_at, :scope => :'datetime.distance_in_words_ago')) %>
         <% comment = changeset.tags["comment"].to_s != "" ? changeset.tags["comment"] : t("browse.no_comment") %>
         "<%= link_to(comment,
                      { :controller => "browse", :action => "changeset", :id => changeset.id },
diff --git a/config/locales/en.yml b/config/locales/en.yml
index ff74c785f..b714e96cd 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2128,12 +2128,10 @@ en:
       remove as friend: Unfriend
       add as friend: Add Friend
       mapper since: "Mapper since:"
-      ago: "(%{time_in_words_ago} ago)"
       ct status: "Contributor terms:"
       ct undecided: Undecided
       ct declined: Declined
-      ct accepted: Accepted %{ago} ago
-      latest edit: "Latest edit %{ago}:"
+      latest edit: "Latest edit (%{ago}):"
       email address: "Email address:"
       created from: "Created from:"
       status: "Status:"