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

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

Browse source
This commit is contained in:
Tom Hughes 2024-12-04 18:46:39 +00:00
commit 98b4d62462
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/views/traces/index.html.erb
View file

@ -56,7 +56,8 @@
</li>
<% end %>
<li class="nav-item">
<%= link_to t(".traces_from", :user => @target_user&.display_name), { :controller => "traces", :action => "index", :display_name => @target_user&.display_name }, { :class => "nav-link active" } %>
<%= link_to t(".traces_from_html", :user => tag.span(@target_user.display_name, :class => "username text-truncate d-inline-block align-bottom", :dir => "auto")),
{ :controller => "traces", :action => "index", :display_name => @target_user.display_name }, { :class => "nav-link active" } %>
</li>
<% end %>
</ul>

2
config/locales/en.yml
View file

@ -2544,7 +2544,7 @@ en:
upload_trace: "Upload a trace"
all_traces: "All Traces"
my_traces: "My Traces"
traces_from: "Public Traces from %{user}"
traces_from_html: "Public Traces from %{user}"
remove_tag_filter: "Remove Tag Filter"
destroy:
scheduled_for_deletion: "Trace scheduled for deletion"