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

[rails.git] / app / views / browse / _relation_member.html.erb

diff --git a/app/views/browse/_relation_member.html.erb b/app/views/browse/_relation_member.html.erb
index 87b7e301bddaa638ca25d9fac809904b6324b1ba..ef8c67e59c0ca00c3f33520f7f740e6eecab547d 100644 (file)
--- a/app/views/browse/_relation_member.html.erb
+++ b/app/views/browse/_relation_member.html.erb
@@ -1,12 +1,14 @@
 <%
   member_class = link_class(relation_member.member_type.downcase, relation_member.member)
 <%
   member_class = link_class(relation_member.member_type.downcase, relation_member.member)

-  linked_name = link_to printable_name(relation_member.member), { :action => relation_member.member_type.downcase, :id => relation_member.member_id.to_s }, :title => link_title(relation_member.member), :rel => link_follow(relation_member.member)
-  type_str = t'browse.relation_member.type.' + relation_member.member_type.downcase
+  linked_name = link_to printable_name(relation_member.member), { :action => relation_member.member_type.downcase, :id => relation_member.member_id.to_s }, { :title => link_title(relation_member.member), :rel => link_follow(relation_member.member) }
+  type_str = t '.type.' + relation_member.member_type.downcase

 %>
 %>

-  <li class="<%= member_class %>"><%=
+<li class="<%= member_class %>">
+  <%=

     if relation_member.member_role.blank?
     if relation_member.member_role.blank?

-      raw t'browse.relation_member.entry', :type => type_str, :name => linked_name
+      raw t '.entry', :type => type_str, :name => linked_name

     else
     else

-      raw t'browse.relation_member.entry_role', :type => type_str, :name => linked_name, :role => h(relation_member.member_role)
+      raw t '.entry_role', :type => type_str, :name => linked_name, :role => h(relation_member.member_role)

     end
     end

-  %></li>
+  %>
+</li>