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

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

Browse source
This commit is contained in:
Tom Hughes 2024-06-06 18:35:48 +01:00
commit 0030c76af0
2 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/users/show.html.erb
View file

@ -137,6 +137,8 @@
<dl class="list-inline"> <dl class="list-inline">
<dt class="list-inline-item m-0"><%= t ".mapper since" %></dt> <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> <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 %> <% unless @user.terms_agreed %>
<dt class="list-inline-item m-0"><%= t ".ct status" %></dt> <dt class="list-inline-item m-0"><%= t ".ct status" %></dt>
<dd class="list-inline-item"> <dd class="list-inline-item">

2
config/locales/en.yml
View file

@ -2828,6 +2828,8 @@ en:
remove as friend: Unfriend remove as friend: Unfriend
add as friend: Add Friend add as friend: Add Friend
mapper since: "Mapper since:" mapper since: "Mapper since:"
last map edit: "Last map edit:"
no activity yet: "No activity yet"
uid: "User id:" uid: "User id:"
ct status: "Contributor terms:" ct status: "Contributor terms:"
ct undecided: Undecided ct undecided: Undecided