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

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

12
app/views/traces/_trace.html.erb
View file

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

4
config/locales/en.yml
View file

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