Merge pull request #4602 from AntonKhorev/no-lego-trace-details

Avoid lego translation in trace time/user/tags string
This commit is contained in:
Andy Allan 2024-03-21 14:01:13 +00:00 committed by GitHub
commit 0dc86d6cd4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 7 deletions

View file

@ -29,11 +29,13 @@
</li>
</ul>
<p class="text-muted mb-0">
<%= friendly_date_ago(trace.timestamp) %>
<%= t ".by" %> <%= link_to trace.user.display_name, trace.user %>
<% if !trace.tags.empty? %>
<%= t ".in" %>
<%= safe_join(trace.tags.collect { |tag| link_to_tag tag.tag }, ", ") %>
<% if trace.tags.empty? %>
<%= t ".details_without_tags_html", :time_ago => friendly_date_ago(trace.timestamp),
:user => link_to(trace.user.display_name, trace.user) %>
<% else %>
<%= t ".details_with_tags_html", :time_ago => friendly_date_ago(trace.timestamp),
:user => link_to(trace.user.display_name, trace.user),
:tags => safe_join(trace.tags.collect { |tag| link_to_tag tag.tag }, ", ") %>
<% end %>
</p>
<p class="fst-italic mb-0">

View file

@ -2541,8 +2541,8 @@ en:
identifiable: "IDENTIFIABLE"
private: "PRIVATE"
trackable: "TRACKABLE"
by: "by"
in: "in"
details_with_tags_html: "%{time_ago} by %{user} in %{tags}"
details_without_tags_html: "%{time_ago} by %{user}"
index:
public_traces: "Public GPS Traces"
my_gps_traces: "My GPS Traces"