From d3f9f234652ecb283a044518c8164a7d89ee1970 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Wed, 31 Dec 2014 09:05:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=BE=E7=A8=8B=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=AF=BC=E5=87=BA=E7=9A=84=E6=96=87=E4=BB=B6=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb | 2 +-
 config/locales/zh.yml                 | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index f595a0c7d..73f78b587 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -371,7 +371,7 @@ class CoursesController < ApplicationController
     respond_to do |format|
       format.xls {
         send_data(member_to_xls(@all_members,@course.course_groups), :type => "text/excel;charset=utf-8; header=present",
-                  :filename => "student_list_#{Time.now.strftime("%Y%m%d")}.xls")
+                  :filename => "#{@course.teacher.lastname.to_s + @course.teacher.firstname.to_s + @course.name + @course.time.to_s + @course.term}#{l(:excel_member_list)}.xls")
       }
     end
   end
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 46fdc417a..dee8246f2 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2102,6 +2102,7 @@ zh:
   excel_homework_score: 作业积分
   excel_class: "班级:"
   excel_member_with_out_class: "未加入班级的学生"
+  excel_member_list: 成员列表
   label_export_excel: 导出Excel
 
   label_softapplication: 应用软件