Merge remote-tracking branch 'upstream/pull/2921' into master

This commit is contained in:
Tom Hughes 2020-11-13 10:49:35 +00:00
commit 4347d9d3b0
12 changed files with 30 additions and 17 deletions

View file

@ -1,6 +1,6 @@
<% 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 ".type." + relation_member.member_type.downcase %>
type_str = t ".type.#{relation_member.member_type.downcase}" %>
<li class="<%= member_class %>">
<%= if relation_member.member_role.blank?
t ".entry_html", :type => type_str, :name => linked_name