Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

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(:label_newfeedback_respond),'',
                             {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea'), ''); $('##{ids} textarea') ;return false;"}
                 %>
              </span>

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(:label_newfeedback_respond),'',
                                      {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{id}'), $('##{id} textarea'), ''); return false;"} %>
                 <% end %>  <!-- #{l(:label_reply_plural)} #{m_reply_id.user.name}: -->
             </span>

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(:label_newfeedback_respond),'',
                             {: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? %>

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(:label_newfeedback_respond),'#',
                             {:focus => 'project_respond',
                              :onclick => "toggleAndSettingWordsVal($('##{id}'),
 							$('##{id} textarea'),

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(:label_newfeedback_respond),'',
                                      {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{id}'), $('##{id} textarea'), ''); return false;"} %>
                 <% end %>  <!-- #{l(:label_reply_plural)} #{m_reply_id.user.name}: -->
             </span>

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(:label_newfeedback_respond),'',
                 {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea'), '#{l(:label_reply_plural)} #{journal.user.name}: '); $('##{ids} textarea') ;return false;"}
              %>
       <% end %>