From: Tom Hughes Date: Wed, 4 Dec 2024 18:59:21 +0000 (+0000) Subject: Merge remote-tracking branch 'upstream/pull/5374' X-Git-Tag: live~18 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/0b97b6bc343d8428367e5fa91ef41e95386880f7?hp=12998355a370c5af1302b271a994d27d40b7e731 Merge remote-tracking branch 'upstream/pull/5374' --- diff --git a/app/views/browse/_containing_relation.html.erb b/app/views/browse/_containing_relation.html.erb index febb3e129..2ab0fcf97 100644 --- a/app/views/browse/_containing_relation.html.erb +++ b/app/views/browse/_containing_relation.html.erb @@ -1,6 +1,6 @@ -
  • <%= linked_name = link_to printable_element_name(containing_relation.relation), containing_relation.relation +
  • <%= 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 %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 986a30db9..fbb1f956c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -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."