Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/pull/5374'
Browse files Browse the repository at this point in the history
  • Loading branch information
tomhughes committed Dec 4, 2024
2 parents 1299835 + 6b55cce commit 0b97b6b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
4 changes: 2 additions & 2 deletions app/views/browse/_containing_relation.html.erb
Original file line number Diff line number Diff line change
@@ -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?
t ".entry_html", :relation_name => linked_name
linked_name
else
t ".entry_role_html", :relation_name => linked_name, :relation_role => containing_relation.member_role
end %>
Expand Down
3 changes: 1 addition & 2 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -356,8 +356,7 @@ en:
way: "Way"
relation: "Relation"
containing_relation:
entry_html: "Relation %{relation_name}"
entry_role_html: "Relation %{relation_name} (as %{relation_role})"
entry_role_html: "%{relation_name} (as %{relation_role})"
not_found:
title: Not Found
sorry: "Sorry, %{type} #%{id} could not be found."
Expand Down

0 comments on commit 0b97b6b

Please sign in to comment.