From 4f3055c99038b535d451e10907926c520c53b4a1 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 4 Mar 2016 17:11:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A8=E8=AE=BA=E5=8C=BA=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E9=97=AE=E7=AD=94=E5=8C=BA=EF=BC=8C=E4=B8=94=E6=94=BE=E5=BC=80?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=9A=84=E2=80=9C=E9=97=AE=E7=AD=94=E5=8C=BA?=
 =?UTF-8?q?=E2=80=9D=EF=BC=8C=E5=B0=B1=E6=98=AF=E8=AF=BE=E5=A4=96=E7=9A=84?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=B9=9F=E8=83=BD=E5=9C=A8=E5=85=AC=E5=BC=80?=
 =?UTF-8?q?=E8=AF=BE=E5=86=85=E5=8F=91=E5=B8=96=E6=88=96=E5=9B=9E=E5=B8=96?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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_message.html.erb             | 2 +-
 config/locales/zh.yml                                | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/views/boards/_course_show.html.erb b/app/views/boards/_course_show.html.erb
index de3b038e6..16b4fcd3d 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>
   <% if User.current.logged? %>
diff --git a/app/views/courses/_tool_expand.html.erb b/app/views/courses/_tool_expand.html.erb
index 3ded0cb1d..aedeec5ef 100644
--- a/app/views/courses/_tool_expand.html.erb
+++ b/app/views/courses/_tool_expand.html.erb
@@ -24,7 +24,7 @@
 <% if show_nav?(@course.boards.first ? @course.boards.first.topics.count : 0) %>
     <div class="subNav">
       <%= link_to l(:label_course_board), course_boards_path(@course), :class => "f12 c_blue02 ml10 fn" %>
-      <%= link_to( "",course_boards_path(@course, :flag => true, :is_new => 1), :class => 'courseMenuSetting', :title =>"#{l(:label_message_new)}") if User.current.member_of_course?(@course) && @course.boards.first %>
+      <%= link_to( "",course_boards_path(@course, :flag => true, :is_new => 1), :class => 'courseMenuSetting', :title =>"#{l(:label_message_new)}") %>
     </div>
 <% end %>
 <% if show_nav?(course_feedback_count) %>
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index fa59fbed9..1e0bf0c60 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -104,7 +104,7 @@
         <div class="subNav">
           <%= link_to l(:label_course_board), course_boards_path(@course), :class => "f14 c_blue02" %>
           <%= link_to "(#{@course.boards.first ? (@course.boards.first.topics.count + Message.where("board_id =? and parent_id is not ?", @course.boards.first.id, nil).count) : 0})", course_boards_path(@course), :class => "subnav_num c_orange" %>
-          <%= link_to( "",course_boards_path(@course, :flag => true, :is_new => 1), :class => 'courseMenuSetting', :title =>"#{l(:label_message_new)}") if User.current.member_of_course?(@course) && @course.boards.first %>
+          <%= link_to( "",course_boards_path(@course, :flag => true, :is_new => 1), :class => 'courseMenuSetting', :title =>"#{l(:label_message_new)}") %>
         </div>
         <% end %>
         <% unless show_nav?(course_feedback_count) %>
diff --git a/app/views/organizations/_org_course_message.html.erb b/app/views/organizations/_org_course_message.html.erb
index 4f13e1b4f..8f18c10d8 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_path(activity.author_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
         <% end %>
         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/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index 7e8a24bb2..47ad2d6d3 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -20,7 +20,7 @@
             <% end %>
         <% end %>
         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 e9d3ed813..114e67370 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -614,7 +614,7 @@ zh:
   label_homework_info: 提交情况  #huang
 
   label_course_news_description: '课程必须是高校正式开设的课程，或是围绕特定主题定期发布课程资料的公共开放课程；<br/>如果您想创建一个协作研究空间，请您前往“我的项目”页面创建项目，谢谢！'
-  label_course_board: 讨论区
+  label_course_board: 问答区
   label_version: 版本
   label_version_new: 新建版本
 
@@ -1731,7 +1731,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: 发布成功