Merge changeset browser branch to trunk.

[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 39b89bc0100681be236d477ec7df387bb325e580..cee2e0e75b7157aeb7fcf1f95d0d525aab3c2c06 100644 (file)
--- a/app/views/browse/_relation_member.html.erb
+++ b/app/views/browse/_relation_member.html.erb
@@ -1,10 +1,12 @@
 <tr>
 <tr>

-  <td>
-    <%= relation_member.member_type.capitalize %>
-    <%= link_to h(printable_name(relation_member.member)), :action => relation_member.member_type.downcase, :id => relation_member.member_id.to_s %>
-    <% unless relation_member.member_role.blank? %>
-      <%= t'browse.relation_member.as' %>
-      <%= h(relation_member.member_role) %>
-    <% end %>
-  </td>
+  <td><%=
+    linked_name = link_to h(printable_name(relation_member.member)), :action => relation_member.member_type.downcase, :id => relation_member.member_id.to_s
+    type_str = t'browse.relation_member.type.' + relation_member.member_type.downcase
+
+    if relation_member.member_role.blank?
+      t'browse.relation_member.entry', :type => type_str, :name => linked_name
+    else
+      t'browse.relation_member.entry_role', :type => type_str, :name => linked_name, :role => h(relation_member.member_role)
+    end
+  %></td>

 </tr> 
 </tr>