diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 8488881e8..4088fec27 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -116,12 +116,25 @@
<% unless user.memberships.empty? %> - <%= l(:label_x_contribute_to, :count => user.memberships.count) %> - <% for member in user.memberships %> + <% cond = Project.visible_condition(User.current) + "AND projects.project_type <> 1" %> + <% memberships = user.memberships.all(:conditions => cond) %> + <%= l(:label_x_contribute_to, :count => memberships.count) %> + <% for member in memberships %> <%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : ',' %> <% end %> <% end %> - <%= user.changesets.count == 0 ? '' : ",#{l(:label_x_total_commit, :count => user.changesets.count)}" %> + +

<% unless user.memberships.empty? %> + <% cond = Project.visible_condition(User.current) + "AND projects.project_type = 1" %> + <% memberships = user.memberships.all(:conditions => cond) %> + <%= l(:label_x_course_contribute_to, :count => memberships.count) %> + <% for member in memberships %> + <%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : ',' %> + <% end %> + <% end %> +

+ + <%= user.changesets.count == 0 ? '' : "#{l(:label_x_total_commit, :count => user.changesets.count)}" %>
<% end -%> diff --git a/config/locales/zh.yml b/config/locales/zh.yml index bed8f4ecf..305303f53 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -1571,7 +1571,12 @@ zh: label_endup_time: 结课时间 label_class_period: 整体课时 label_class_hour: 学时 - + + label_course_contribute_to: 参与了 %{project_count} 个项目: + label_x_course_contribute_to: + zero: "参与了 %{count} 个课程:" + one: "参与了 %{count} 个课程:" + other: "参与了 %{count} 个课程:" #end