label写错纠正，一个写死的主页链接纠正

app/helpers/projects_helper.rb

@@ -176,14 +176,14 @@ module ProjectsHelper
       #Modified by young
         if (project.try(:project_type) == Project::ProjectType_course )
           unless project.is_public == 1
-          s = "<span class='private_project'>#{l(:lable_private)}</span>".html_safe
+          s = "<span class='private_project'>#{l(:label_private)}</span>".html_safe
           else
             s = "".html_safe
           end
           s += link_to_project(project, {}, :class => "#{project.css_classes} #{User.current.member_of?(project) ? 'my-project' : nil}").html_safe
         else
           unless project.is_public
-            s = "<span class='private_project'>#{l(:lable_private)}</span>".html_safe
+            s = "<span class='private_project'>#{l(:label_private)}</span>".html_safe
           else
             s = "".html_safe
           end

app/views/courses/_course.html.erb

@@ -11,7 +11,7 @@
 	<p >
 		<%= content_tag('span',"#{l(:label_bid_show_course_name)}:", :class => "course-font")%>
         <% unless @course.is_public == 1 %>
-            <span class='private_project'><%= l(:lable_private) %></span>
+            <span class='private_project'><%= l(:label_private) %></span>
         <% end %>
 		<%= content_tag('span', link_to("#{@course.name}", course_path(@course), :class => "info"))%>
 	</p>

app/views/files/_course_sort_by_attachtypel.html.erb

@@ -37,7 +37,7 @@
                 <!-- <td class="created_on"><%#= format_time(file.created_on) %></td> -->
                 <td class="filesize"><%= number_to_human_size(file.filesize) %></td>
                 <td class="attach_type">
-                  <span id="attach_type_id_label<%= file.id %>" style="white-space:nowrap;"><%= file.attachmentstype.nil? ? l(:lable_unknow_type):file.attachmentstype.typeName %></span>
+                  <span id="attach_type_id_label<%= file.id %>" style="white-space:nowrap;"><%= file.attachmentstype.nil? ? l(:label_unknow_type):file.attachmentstype.typeName %></span>
                   &nbsp;
       <span id="attach_type_id_edit<%= file.id %>" style="white-space:nowrap;">
         <%= render :partial => 'attachments/course_type_edit', :locals => {:attachmenttypes => attachmenttypes,

app/views/files/_sort_by_attachtypel.html.erb

@@ -37,7 +37,7 @@
                 <!-- <td class="created_on"><%#= format_time(file.created_on) %></td> -->
                 <td class="filesize"><%= number_to_human_size(file.filesize) %></td>
                 <td class="attach_type">
-                  <span id="attach_type_id_label<%= file.id %>" style="white-space:nowrap;"><%= file.attachmentstype.nil? ? l(:lable_unknow_type):file.attachmentstype.typeName %></span>
+                  <span id="attach_type_id_label<%= file.id %>" style="white-space:nowrap;"><%= file.attachmentstype.nil? ? l(:label_unknow_type):file.attachmentstype.typeName %></span>
                   &nbsp;
       <span id="attach_type_id_edit<%= file.id %>" style="white-space:nowrap;">
         <%= render :partial => 'attachments/type_edit', :locals => {:attachmenttypes => attachmenttypes,

app/views/forums/_form.html.erb

@@ -21,7 +21,7 @@
       <script src="/javascripts/ckeditor/ckeditor.js?1404953555" type="text/javascript"></script>
       <%= f.text_area :description, :required => true, :id => 'editor01' %>
       <script type="text/javascript">var ckeditor=CKEDITOR.replace('editor01',{height:300});</script>
-      <p style="color: #ff0000">(<%= l(:lable_forums_max_length) %>)</p>
+      <p style="color: #ff0000">(<%= l(:label_forums_max_length) %>)</p>
     </div>
     <div class="actions" style=" padding-top: 10px; float:right">
       <%= submit_tag l(:button_submit) %>

app/views/forums/show.html.erb

@@ -18,7 +18,7 @@
 		<p><%= f.text_field :subject, :required => true%></p>
 		<p style="max-width:680px"><%= f.text_area :content, :required => true, :id => 'editor02' %></p>
 		<script type="text/javascript">var ckeditor=CKEDITOR.replace('editor02');</script>
-        <p style="color: #ff0000">(<%= l(:lable_memos_max_length) %>)</p>
+        <p style="color: #ff0000">(<%= l(:label_memos_max_length) %>)</p>
 		<p>
 
 			<%= l(:label_attachment_plural) %><br />

app/views/users/_score_new_index.html.erb

@@ -7,7 +7,7 @@
 <div> = <%= format("%.2f" ,collaboration(option_num)).to_i %> +  <%= format("%.2f" , influence(option_num) ).to_i %>
    + <%= "(" if skill(option_num) < 0 %> <%= format("%.2f" , skill(option_num)).to_i %> <%= ")" if skill(option_num) < 0 %> + <%= format("%.2f" , active(option_num)).to_i %></div>
  <% if (format("%.2f" ,collaboration(option_num)).to_i + format("%.2f" , influence(option_num) ).to_i + format("%.2f" , skill(option_num)).to_i + format("%.2f" , active(option_num)).to_i) < 0 %>
-    <div><%= l(:lable_score_less_than_zero) %></div>
+    <div><%= l(:label_score_less_than_zero) %></div>
     <% else %>
     <div> = <%= format("%.2f" ,option_num.total_score).to_i %></div>
   <% end %>

app/views/welcome/_course_list.html.erb

@@ -7,7 +7,7 @@
       <div class='desc_item'>
                     <span class=''>
                      <% unless course.is_public == 1 %>
-                        <span class="private_project"><%= l(:lable_private) %></span>
+                        <span class="private_project"><%= l(:label_private) %></span>
                      <% end %>
                      <%= link_to(course.name.truncate(30, omission: '...')+":", course_path(course.id), :class => "d-g-blue d-p-project-name", :title => "#{course.name}") %>
 

app/views/welcome/course.html.erb

@@ -92,7 +92,7 @@
 
           <% if User.current.logged? %>
               <li>
-                <%= render :partial => 'no_course_title', :locals => {:course_title => l(:lable_school_no_course)} %>
+                <%= render :partial => 'no_course_title', :locals => {:course_title => l(:label_school_no_course)} %>
               </li>
               <%= render :partial => 'course_list', :locals => {:course_list => find_all_new_hot_course(9, @school_id)} %>
           <% else %>
@@ -115,7 +115,7 @@
           <%= render :partial => 'course_list', :locals => {:course_list => school_course} %>
           <% if school_course.count < 10 %>
               <li>
-                <%= render :partial => 'no_course_title', :locals => {:course_title => l(:lable_school_less_course)} %>
+                <%= render :partial => 'no_course_title', :locals => {:course_title => l(:label_school_less_course)} %>
               </li>
               <%= render :partial => 'course_list', :locals => {:course_list => find_all_new_hot_course(9 - school_course.count, @school_id)} %>
           <% end %>

app/views/welcome/index.html.erb

@@ -73,7 +73,7 @@
 				<!-- 上左下右 -->
 				<div style="float: left; margin-left: 10px; width: 380px;">
                   <% unless project.is_public %>
-                     <span class="private_project"><%= l(:lable_private) %></span>
+                     <span class="private_project"><%= l(:label_private) %></span>
                   <% end %>
 					<%= link_to( project.name, project_path(project.id), :class => "d-g-blue d-p-project-name",:title => "#{project.name}" )%>
 					 (<%= link_to "#{projectCount(project)}人", project_member_path(project) ,:course =>'0' %>) 			

config/locales/en.yml

@@ -1807,7 +1807,14 @@ en:
 
   label_company_name: Company Name
   notice_account_invalid_creditentials_new: You have not to the mailbox activation
-  lable_unknow_type: Unknow type
-  lable_score_less_than_zero: Score less than 0, revised to 0
+  label_school_no_course: The school did not offer any courses, you can view other school curriculum
+  label_school_less_course: The school offers courses in less, you can view other school curriculum
+  label_file_not_found: Sorry, the file can't be downloaded now!
+  label_goto_homepage: Return to the home page
+  label_trustie_team: The Trustie development team
+  label_memos_max_length: The content of the post up to 65535 characters in length
+  label_forums_max_length: Post Bar describing the maximum length of 65535 characters
+  label_unknow_type: Unknow type
+  label_score_less_than_zero: Score less than 0, revised to 0
   review_assignments: review assignments
-  lable_private: private
+  label_private: private

config/locales/zh.yml

@@ -2106,16 +2106,16 @@ zh:
   modal_valid_passing: 可以使用
   label_bug: 漏洞
 
-  lable_school_no_course: 该学校未开设任何课程，您可以查看其他学校课程
-  lable_school_less_course: 该学校开设课程较少，您可以查看其他学校课程
+  label_school_no_course: 该学校未开设任何课程，您可以查看其他学校课程
+  label_school_less_course: 该学校开设课程较少，您可以查看其他学校课程
 
-  lable_file_not_found: 对不起，该文件现在不能下载!
-  lable_goto_homepage: 返回主页
-  lable_trustie_team: Trustie开发团队
+  label_file_not_found: 对不起，该文件现在不能下载!
+  label_goto_homepage: 返回主页
+  label_trustie_team: Trustie开发团队
 
-  lable_memos_max_length: 帖子内容最大长度为65535个字符
-  lable_forums_max_length: 贴吧描述最大长度为65535个字符
-  lable_unknow_type: 未知类型
-  lable_score_less_than_zero: 得分小于0，修正为0
+  label_memos_max_length: 帖子内容最大长度为65535个字符
+  label_forums_max_length: 贴吧描述最大长度为65535个字符
+  label_unknow_type: 未知类型
+  label_score_less_than_zero: 得分小于0，修正为0
   review_assignments: 评审任务
-  lable_private: 私有
+  label_private: 私有

public/file_not_found.html.erb

@@ -26,12 +26,12 @@
 <body>
   <div class="container" >
       <!--<h1>Sorry, this file can not be downloaded now. </h1>-->
-      <h1><%= l(:lable_file_not_found) %></h1>
-      <h3> <a href="http://forge.trustie.net" style=""><%= l(:lable_goto_homepage) %></a> </h3>
+      <h1><%= l(:label_file_not_found) %></h1>
+      <h3> <%= link_to l(:label_goto_homepage),{:controller=>'welcome',:action=>'index',:host=>Setting.host_name} %> </h3>
 
       <div class="container" style="">
         <div style="position: relative; right:0;text-align: right;">
-          <h4><%= l(:lable_trustie_team) %></h4>
+          <h4><%= l(:label_trustie_team) %></h4>
         </div>
       </div>
       <p class="hidden" >