diff --git a/app/helpers/watchers_helper.rb b/app/helpers/watchers_helper.rb index c0468e067..3f0149151 100644 --- a/app/helpers/watchers_helper.rb +++ b/app/helpers/watchers_helper.rb @@ -55,7 +55,7 @@ module WatchersHelper url_f = try_join_path(:object_id => course.id) method = joined ? 'delete' : 'post' if joined - link_to text, url_t, :remote => true, :method => method, :id => 'join', :confirm => l(:text_are_you_sure), :class => []+options + link_to text, url_t, :remote => true, :method => method, :id => 'join', :confirm => l(:text_are_you_sure_out), :class => []+options else link_to text, url_f, :remote => true, :method => method, :id => 'join', :class => []+options end diff --git a/app/views/users/_course_form.html.erb b/app/views/users/_course_form.html.erb index ce8c6bb9d..610c9e633 100644 --- a/app/views/users/_course_form.html.erb +++ b/app/views/users/_course_form.html.erb @@ -12,7 +12,11 @@ - <%= join_in_course(membership.project, User.current)%>    <%= l(:label_x_base_courses_member, :count => membership.project.members.count) %>(<%= link_to "#{membership.project.members.count}", project_member_path(membership.project), :course =>'1' %>)   + + <% unless membership.roles.first.to_s == 'Manager' %> + <%= join_in_course(membership.project, User.current)%>     + <% end %> + <%= l(:label_x_base_courses_member, :count => membership.project.members.count) %>(<%= link_to "#{membership.project.members.count}", project_member_path(membership.project), :course =>'1' %>)   <%= l(:label_homework) %> (<%= link_to (membership.project.homeworks.count), {:controller => 'projects', :action => 'homework', :id => membership.project.identifier} %>)    <%= l(:label_course_news)%> (<%= link_to (membership.project.news.count), {:controller => 'news', :action => 'index', :project_id => membership.project.identifier} %>) diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 09a01f7ad..4c629d6f1 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -964,6 +964,7 @@ zh: text_subprojects_destroy_warning: "以下子项目也将被同时删除:%{value}" text_workflow_edit: 选择角色和跟踪标签来编辑工作流程 text_are_you_sure: 您确定要删除吗? + text_are_you_sure_out: 你确定要退出该课程吗? text_journal_changed: "%{label} 从 %{old} 变更为 %{new}" text_journal_set_to: "%{label} 被设置为 %{value}" text_journal_deleted: "%{label} 已删除 (%{old})"