From 03d6afd1c45f96d147a55764e1e323ff64eaceb7 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Mon, 18 Jul 2016 15:52:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8A=E5=91=A8=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E8=8E=B7=E5=8F=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/courses_helper.rb   | 20 ++++++++++++++++++++
 app/views/courses/show.html.erb | 17 +----------------
 config/locales/courses/zh.yml   | 10 ++++++++++
 3 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index d1f4bfe97..ee520cb77 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -591,6 +591,26 @@ module CoursesHelper
     Course.tagged_with(tag_name).order('updated_at desc')
   end
 
+  # 获取动态列表名称
+  def get_acts_list_type type
+    case type
+      when "homework"
+        ">" + l(:label_homework_acts)
+      when "news"
+        ">" + l(:label_news_acts)
+      when "attachment"
+        ">" + l(:label_attachment_acts)
+      when "message"
+        ">" + l(:label_message_acts)
+      when "journalsForMessage"
+        ">" + l(:label_journalsForMessage_acts)
+      when "poll"
+        ">" + l(:label_poll_acts)
+      else
+        ">" + l(:label_all_cats)
+    end
+  end
+
   #分班下拉框
   def course_group_option course
     type = []
diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb
index cabbb5d04..bf209ddb5 100644
--- a/app/views/courses/show.html.erb
+++ b/app/views/courses/show.html.erb
@@ -10,22 +10,7 @@
 <div class="homepageRight mt0 ml10">
 <div class="homepageRightBanner">
   <div class="NewsBannerName">班级动态
-  <% if params[:type] == "homework" %>
-    <%= ">作业动态" %>
-  <% elsif params[:type] == "news" %>
-    <%= ">通知动态" %>
-  <% elsif params[:type] == "attachment" %>
-    <%= ">资源库动态" %>
-  <% elsif params[:type] == "message" %>
-    <%= ">论坛动态" %>
-  <% elsif params[:type] == "journalsForMessage" %>
-    <%= ">留言动态" %>
-  <% elsif params[:type] == "poll" %>
-    <%= ">问卷动态" %>
-  <% else %>
-    <%= ">全部动态" %>
-  <% end %>
-  </div>
+    <%= get_acts_list_type @type %></div>
   <ul class="resourcesSelect">
     <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
       <ul class="homepagePostType">
diff --git a/config/locales/courses/zh.yml b/config/locales/courses/zh.yml
index 29d6b236c..9a07e0fa8 100644
--- a/config/locales/courses/zh.yml
+++ b/config/locales/courses/zh.yml
@@ -29,6 +29,16 @@ zh:
   label_upload_files: 上传资源
   label_apply_join_course: 申请加入班级
   label_apply_for_homework: 申请引用作业
+
+  #动态名称
+  label_homework_acts: 作业动态
+  label_news_acts: 通知动态
+  label_attachment_acts: 资源库动态
+  label_message_acts: 论坛动态
+  label_journalsForMessage_acts: 留言动态
+  label_poll_acts: 问卷动态
+  label_all_cats: 全部动态
+
   #
   #  课程托管平台主页
   #