From 8a7fc85e8b69c7ec5838175c86abb6a6eedb569f Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 10 Mar 2015 14:25:17 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E4=B8=AD=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E7=9A=84=E6=9C=AC=E5=9C=B0=E5=8C=96=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E7=BC=BA=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/homework_attach/_jour.html.erb                | 2 +-
 app/views/homework_attach/_journal_reply_items.html.erb | 2 +-
 app/views/homework_attach/_showjour.html.erb            | 2 +-
 app/views/words/_feedback.html.erb                      | 2 +-
 app/views/words/_journal_reply_items.html.erb           | 2 +-
 app/views/words/_message.html.erb                       | 2 +-
 config/locales/zh.yml                                   | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/views/homework_attach/_jour.html.erb b/app/views/homework_attach/_jour.html.erb
index cae04b0c0..0544baea3 100644
--- a/app/views/homework_attach/_jour.html.erb
+++ b/app/views/homework_attach/_jour.html.erb
@@ -25,7 +25,7 @@
                                                                :homework_id =>homework.id },
                                 :remote => true, :confirm => l(:text_are_you_sure),  :title => l(:button_delete))  %>
                 <% end %>
-                <%= link_to l(:label_newfeedback_respone),'',
+                <%= link_to l(:button_reply),'',
                             {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea'), ''); $('##{ids} textarea') ;return false;"}
                 %>
              </span>
diff --git a/app/views/homework_attach/_journal_reply_items.html.erb b/app/views/homework_attach/_journal_reply_items.html.erb
index 2c7ac886c..fc48c31cf 100644
--- a/app/views/homework_attach/_journal_reply_items.html.erb
+++ b/app/views/homework_attach/_journal_reply_items.html.erb
@@ -34,7 +34,7 @@
                               :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "delete", :title => l(:button_delete))  %>
                 <% end %>
               <% if reply_allow %>
-                         <%= link_to l(:label_newfeedback_respone),'',
+                         <%= link_to l(:button_reply),'',
                                      {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{id}'), $('##{id} textarea'), ''); return false;"} %>
                 <% end %>  <!-- #{l(:label_reply_plural)} #{m_reply_id.user.name}: -->
             </span>
diff --git a/app/views/homework_attach/_showjour.html.erb b/app/views/homework_attach/_showjour.html.erb
index 018d16141..90f18311e 100644
--- a/app/views/homework_attach/_showjour.html.erb
+++ b/app/views/homework_attach/_showjour.html.erb
@@ -65,7 +65,7 @@
                 </span>
               <% ids = 'project_respond_form_'+ journal.id.to_s%>
             <span>
-                <%= link_to l(:label_newfeedback_respone),'',
+                <%= link_to l(:button_reply),'',
                             {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea'), '#{l(:label_reply_plural)} #{journal.user.name}: '); $('##{ids} textarea') ;return false;"}
                 %>
               <% if journal.user==User.current|| User.current.admin? %>
diff --git a/app/views/words/_feedback.html.erb b/app/views/words/_feedback.html.erb
index 493378279..a64159a88 100644
--- a/app/views/words/_feedback.html.erb
+++ b/app/views/words/_feedback.html.erb
@@ -11,7 +11,7 @@
           <% id = 'project_respond_form_'+journal.id.to_s%>
           <span>
 			<% if reply_allow %>
-				<%= link_to l(:label_newfeedback_respone),'#',
+				<%= link_to l(:button_reply),'#',
                             {:focus => 'project_respond',
                              :onclick => "toggleAndSettingWordsVal($('##{id}'),
 							$('##{id} textarea'),
diff --git a/app/views/words/_journal_reply_items.html.erb b/app/views/words/_journal_reply_items.html.erb
index 9076006cc..bd76bc52d 100644
--- a/app/views/words/_journal_reply_items.html.erb
+++ b/app/views/words/_journal_reply_items.html.erb
@@ -36,7 +36,7 @@
                               :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "delete", :title => l(:button_delete))  %>
                 <% end %>
               <% if reply_allow %>
-                         <%= link_to l(:label_newfeedback_respone),'',
+                         <%= link_to l(:button_reply),'',
                                      {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{id}'), $('##{id} textarea'), ''); return false;"} %>
                 <% end %>  <!-- #{l(:label_reply_plural)} #{m_reply_id.user.name}: -->
             </span>
diff --git a/app/views/words/_message.html.erb b/app/views/words/_message.html.erb
index 163f13523..cbdb9f6f6 100644
--- a/app/views/words/_message.html.erb
+++ b/app/views/words/_message.html.erb
@@ -51,7 +51,7 @@ function checkMaxLength() {
 			<% ids = 'project_respond_form_'+ journal.id.to_s%>
 		<span>
 			<% if reply_allow %>
-			<%= link_to l(:label_newfeedback_respone),'',
+			<%= link_to l(:button_reply),'',
                 {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea'), '#{l(:label_reply_plural)} #{journal.user.name}: '); $('##{ids} textarea') ;return false;"}
              %>
       <% end %>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index ac975f67f..934401706 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2380,4 +2380,4 @@ zh:
   label_recently_updated_homework: 最近更新了作业
   label_recently_updated_message: 最近更新了留言
   label_recently_updated_courseware: 最近更新了课件
-  label_no_courses: 您没有参与任何课程，请搜索课程、加入课程，或者创建课程吧！
+  label_no_courses: 您没有参与任何课程，请搜索课程、加入课程，或者创建课程吧！
\ No newline at end of file