Merge remote-tracking branch 'upstream/pull/4881'

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index b6c5c6053373fa380045b51dc01564b18a68ace8..2c40cfebed99c2183451910ca675c28e6eed62bd 100644 (file)
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -137,6 +137,8 @@
           <dl class="list-inline">
             <dt class="list-inline-item m-0"><%= t ".mapper since" %></dt>
             <dd class="list-inline-item"><%= l @user.created_at.to_date, :format => :long %></dd>
+            <dt class="list-inline-item m-0"><%= t ".last map edit" %></dt>
+            <dd class="list-inline-item"><%= l @user.changesets.first&.created_at&.to_date, :format => :long, :default => t(".no activity yet") %></dd>
             <% unless @user.terms_agreed %>
               <dt class="list-inline-item m-0"><%= t ".ct status" %></dt>
               <dd class="list-inline-item">

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4a103b21e685fce85f095420e214269b4e723afd..1da263d77337e4ee8bef5d3748f3f60daffa6634 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2828,6 +2828,8 @@ en:
       remove as friend: Unfriend
       add as friend: Add Friend
       mapper since: "Mapper since:"
+      last map edit: "Last map edit:"
+      no activity yet: "No activity yet"
       uid: "User id:"
       ct status: "Contributor terms:"
       ct undecided: Undecided