From a6fc79a47455512ff272ae5de9f7456931f7bd03 Mon Sep 17 00:00:00 2001 From: alan <547533434@qq.com> Date: Sat, 6 Dec 2014 15:09:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B0=86=E5=88=86=E7=BB=84=E6=94=B9?= =?UTF-8?q?=E6=88=90=E5=88=86=E7=8F=AD=20Signed-off-by:=20alan=20<54753343?= =?UTF-8?q?4@qq.com>?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/locales/zh.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/zh.yml b/config/locales/zh.yml index a23fd06c1..c0bc4df73 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -1125,7 +1125,7 @@ zh: text_workflow_edit: 选择角色和跟踪标签来编辑工作流程 text_are_you_sure: 您确定要删除吗？ text_are_you_sure_out: 你确定要退出该课程吗？ - text_are_you_sure_out_group: 你确定要退出该分组吗？ + text_are_you_sure_out_group: 你确定要退出该分班吗？ text_journal_changed: "%{label} 从 %{old} 变更为 %{new}" text_journal_set_to: "%{label} 被设置为 %{value}" text_journal_deleted: "%{label} 已删除 (%{old})" From 47da84dee0995151fa848166b710b8e09d01b9ab Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Sat, 6 Dec 2014 16:27:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=90=8E=E6=9F=A5=E8=AF=A2=E6=A1=86=E6=B6=88?= =?UTF-8?q?=E5=A4=B1=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/_member_list.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/courses/_member_list.html.erb b/app/views/courses/_member_list.html.erb index 1c71d915a..c707487a7 100644 --- a/app/views/courses/_member_list.html.erb +++ b/app/views/courses/_member_list.html.erb @@ -5,7 +5,7 @@ <% end %>    <%= l(:label_current_group)%>: <%= @group.name %> <% end %> - <% if @show_serch%> + <% if @subPage_title && @subPage_title == l(:label_student_list)%> <%= form_tag( searchmembers_course_path(@course), method: 'get',:class => "f_l",:style => "margin-left: 5px; ",:remote=>true) do %> <%= text_field_tag 'name', params[:name], name: "name", :class => 'f_1', :style => "height:15px"%> <%= submit_tag l(:label_search), :class => "f_2"%>