From b33136c59bc414ba20cc7677d06b9d124aa3fa2c Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 25 Aug 2016 15:59:09 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E9=97=AE=E7=AD=94=E5=8C=BA?=
 =?UTF-8?q?=E6=94=B9=E6=88=90=E8=AE=A8=E8=AE=BA=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/entities/activity.rb                  | 10 +++++-----
 app/views/boards/_course_show.html.erb               |  2 +-
 app/views/courses/_tool_expand.html.erb              |  2 +-
 app/views/layouts/base_courses.html.erb              |  2 +-
 app/views/organizations/_org_course_message.html.erb |  2 +-
 app/views/users/_course_boardlist.html.erb           |  2 +-
 app/views/users/_course_message.html.erb             |  2 +-
 config/locales/zh.yml                                |  6 +++---
 public/assets/wechat/course_discussion.html          |  2 +-
 9 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/api/mobile/entities/activity.rb b/app/api/mobile/entities/activity.rb
index 2856354a1..0ad3a9dfb 100644
--- a/app/api/mobile/entities/activity.rb
+++ b/app/api/mobile/entities/activity.rb
@@ -73,15 +73,15 @@ module Mobile
                   if ac.container_type == "Course"
                     case ac.act_type
                       when "HomeworkCommon"
-                        "课程作业"
+                        "班级作业"
                       when "News"
-                        "课程通知"
+                        "班级通知"
                       when "Message"
-                        "课程问答区"
+                        "班级讨论区"
                       when "Poll"
-                        "课程问卷"
+                        "班级问卷"
                       when "Course"
-                        "课程"
+                        "班级"
                     end
                   elsif ac.container_type == "Project"
                     case ac.act_type
diff --git a/app/views/boards/_course_show.html.erb b/app/views/boards/_course_show.html.erb
index 46191b5d3..6759e33ce 100644
--- a/app/views/boards/_course_show.html.erb
+++ b/app/views/boards/_course_show.html.erb
@@ -22,7 +22,7 @@
 <div class="homepageRight mt0 ml10">
   <div class="homepageRightBanner">
     <div class="NewsBannerName">
-      班级问答区
+      班级讨论区
     </div>
   </div>
   <div nhname="topic_form">
diff --git a/app/views/courses/_tool_expand.html.erb b/app/views/courses/_tool_expand.html.erb
index 5f9e512d7..72ae83b92 100644
--- a/app/views/courses/_tool_expand.html.erb
+++ b/app/views/courses/_tool_expand.html.erb
@@ -2,7 +2,7 @@
 <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %>
 <% if show_nav?(@course.boards.first ? @course.boards.first.topics.count : 0) %>
     <li>
-      <a href="<%=course_boards_path(@course) %>">问答区</a>
+      <a href="<%=course_boards_path(@course) %>">讨论区</a>
       <%= link_to( "",course_boards_path(@course, :flag => true, :is_new => 1), :class => 'sy_class_add', :title =>"#{l(:label_message_new)}") %>
     </li>
 <% end %>
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 86a0a5518..5de64aeba 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -65,7 +65,7 @@
           <% unless show_nav?(@course.boards.first ? @course.boards.first.topics.count : 0) %>
               <li id="sy_02" class="sy_icons_boards">
                 <% count = @course.boards.first ? (@course.boards.first.topics.count + Message.where("board_id =? and parent_id is not ?", @course.boards.first.id, nil).count) : 0 %>
-                <a href="<%=course_boards_path(@course) %>">问答区<span><%=count %></span></a>
+                <a href="<%=course_boards_path(@course) %>">讨论区<span><%=count %></span></a>
                 <%= link_to( "",course_boards_path(@course, :flag => true, :is_new => 1), :class => 'sy_class_add', :title =>"#{l(:label_message_new)}") %>
               </li>
           <% end %>
diff --git a/app/views/organizations/_org_course_message.html.erb b/app/views/organizations/_org_course_message.html.erb
index 40f18772d..ea074344d 100644
--- a/app/views/organizations/_org_course_message.html.erb
+++ b/app/views/organizations/_org_course_message.html.erb
@@ -12,7 +12,7 @@
             <%= link_to activity.try(:author).try(:realname), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
         <% end %>
         TO
-        <%= link_to activity.course.name.to_s+" | 班级问答区", course_boards_url_in_org(activity.course.id), :class => "newsBlue ml15 mr5"%>
+        <%= link_to activity.course.name.to_s+" | 班级讨论区", course_boards_url_in_org(activity.course.id), :class => "newsBlue ml15 mr5"%>
       </div>
       <div class="homepagePostTitle hidden m_w530 fl">
         <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
diff --git a/app/views/users/_course_boardlist.html.erb b/app/views/users/_course_boardlist.html.erb
index bdff80d33..86b308778 100644
--- a/app/views/users/_course_boardlist.html.erb
+++ b/app/views/users/_course_boardlist.html.erb
@@ -1,7 +1,7 @@
 <div class = "cl"> </div>
 <div id="course-boardlist">
   <div class="listbox mt10" >
-    <h2 class="list-h2">问答区列表</h2>
+    <h2 class="list-h2">讨论区列表</h2>
     <div class="category">
       <span class="grayTxt ">排序：</span>
       <%= link_to "时间", {:controller => 'boards', :action => 'index',  :type => @type,  :sort => @b_sort, :order => 1 }, :class => "sortTxt", :remote => true %>
diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index 692ad4e59..3452bec9d 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -8,7 +8,7 @@
       <div class="homepagePostTo break_word">
         <%= link_to activity.author.show_name, user_path(activity.author_id, :host=>Setting.host_user), :class => "newsBlue mr15" %>
         TO
-        <%= link_to activity.course.name.to_s+" | 班级问答区", course_boards_path(activity.course,:host=> Setting.host_course), :class => "newsBlue ml15 mr5"%>
+        <%= link_to activity.course.name.to_s+" | 班级讨论区", course_boards_path(activity.course,:host=> Setting.host_course), :class => "newsBlue ml15 mr5"%>
       </div>
       <div class="homepagePostTitle hidden m_w530 fl">
         <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 59aca719b..d153ffe95 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -621,7 +621,7 @@ zh:
   label_homework_info: 提交情况  #huang
 
   label_course_news_description: '课程必须是高校正式开设的课程，或是围绕特定主题定期发布课程资料的公共开放课程；<br/>如果您想创建一个协作研究空间，请您前往“我的项目”页面创建项目，谢谢！'
-  label_course_board: 问答区
+  label_course_board: 讨论区
   label_version: 版本
   label_version_new: 新建版本
 
@@ -1743,7 +1743,7 @@ zh:
   label_newbie_faq: '新手指引 & 问答'
   label_hot_project: '热门项目'
   label_borad_project: 项目讨论区
-  label_borad_course: 班级问答区
+  label_borad_course: 班级讨论区
   label_borad_org_subfield: 资源栏目讨论区
   view_borad_course: 课程讨论
   label_memo_create_succ: 发布成功
@@ -2143,7 +2143,7 @@ zh:
   #微信模板消息
   label_new_homework_template: 您有新作业了。
   label_update_homework_template: 您的作业已被修改。
-  label_course_topic_template: 课程问答区有新帖子发布了。
+  label_course_topic_template: 班级讨论区有新帖子发布了。
   label_topic_comment_template: 您的帖子有新回复了。
   label_project_topic_template: 项目讨论区有新帖子发布了。
   label_issue_comment_template: 您的缺陷有新回复了。
diff --git a/public/assets/wechat/course_discussion.html b/public/assets/wechat/course_discussion.html
index 3d7444c95..d35d4a364 100644
--- a/public/assets/wechat/course_discussion.html
+++ b/public/assets/wechat/course_discussion.html
@@ -16,7 +16,7 @@
                     <div class="cl"></div>
                     <div class="ml40">
                         <div class="post-dynamic-title c-black fb">{{discussion.subject}}<img ng-if="discussion.locked" src="/images/locked.png" style="display:inline-block;" /></div>
-                        <div class="c-grey4 f13 mt5"><span class="mr10">{{discussion.course_project_name}} - 课程问答区</span><span>{{discussion.created_on}}</span></div>
+                        <div class="c-grey4 f13 mt5"><span class="mr10">{{discussion.course_project_name}} - 班级讨论区</span><span>{{discussion.created_on}}</span></div>
                         <div class="f13 c-black mt5 text-control post-all-content" ng-bind-html="discussion.content|safeHtml"></div>
                         <div class="cl"></div>
                         <div class="fr f13">