qyzh1996
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修正了用户列表里“参与了xx个项目”改为“参与了XX个项目”和“参与了XX个课程”

This commit is contained in:
baiyu 2013-11-08 09:02:14 +08:00
parent 3966e0bc0b
commit a52944811b
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/views/users/index.html.erb
View File

@ -116,12 +116,25 @@
<div class="user-bottom">
<% 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)}" %>
<p><% 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 %>
</p>
<%= user.changesets.count == 0 ? '' : "#{l(:label_x_total_commit, :count => user.changesets.count)}" %>
</div>
</div>
<% end -%>

7
config/locales/zh.yml
View File

@ -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