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

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

Browse source
This commit is contained in:
Tom Hughes 2024-12-04 18:59:21 +00:00
commit 0b97b6bc34
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/views/browse/_containing_relation.html.erb
View file

@ -1,6 +1,6 @@
<li><%= linked_name = link_to printable_element_name(containing_relation.relation), containing_relation.relation <li><%= linked_name = link_to printable_element_name(containing_relation.relation), containing_relation.relation, :class => "relation"
if containing_relation.member_role.blank? if containing_relation.member_role.blank?
t ".entry_html", :relation_name => linked_name linked_name
else else
t ".entry_role_html", :relation_name => linked_name, :relation_role => containing_relation.member_role t ".entry_role_html", :relation_name => linked_name, :relation_role => containing_relation.member_role
end %> end %>

3
config/locales/en.yml
View file

@ -356,8 +356,7 @@ en:
way: "Way" way: "Way"
relation: "Relation" relation: "Relation"
containing_relation: containing_relation:
entry_html: "Relation %{relation_name}" entry_role_html: "%{relation_name} (as %{relation_role})"
entry_role_html: "Relation %{relation_name} (as %{relation_role})"
not_found: not_found:
title: Not Found title: Not Found
sorry: "Sorry, %{type} #%{id} could not be found." sorry: "Sorry, %{type} #%{id} could not be found."