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 febb3e129fcbdd4575a80cc4d024cab458415b42..2ab0fcf9785d6bd445cabdbdcbbc0eef77af011d 100644 (file)
--- a/app/views/browse/_containing_relation.html.erb
+++ b/app/views/browse/_containing_relation.html.erb
@@ -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 %>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 986a30db9464c8ec0f88d73538f0460dbd73e79d..fbb1f956c81d9178adb55b92aaf0948f9f2eacd7 100644 (file)
--- 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."