diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 6849ba83d..b0f54a5f0 100644
--- a/app/helpers/projects_helper.rb
+++ b/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 = "#{l(:lable_private)}".html_safe
+ s = "#{l(:label_private)}".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 = "#{l(:lable_private)}".html_safe
+ s = "#{l(:label_private)}".html_safe
else
s = "".html_safe
end
diff --git a/app/views/courses/_course.html.erb b/app/views/courses/_course.html.erb
index 12eec558f..239f2da26 100644
--- a/app/views/courses/_course.html.erb
+++ b/app/views/courses/_course.html.erb
@@ -11,7 +11,7 @@
<%= content_tag('span',"#{l(:label_bid_show_course_name)}:", :class => "course-font")%>
<% unless @course.is_public == 1 %>
- <%= l(:lable_private) %>
+ <%= l(:label_private) %>
<% end %>
<%= content_tag('span', link_to("#{@course.name}", course_path(@course), :class => "info"))%>
diff --git a/app/views/files/_course_sort_by_attachtypel.html.erb b/app/views/files/_course_sort_by_attachtypel.html.erb
index c13d76620..5a0cdba02 100644
--- a/app/views/files/_course_sort_by_attachtypel.html.erb
+++ b/app/views/files/_course_sort_by_attachtypel.html.erb
@@ -37,7 +37,7 @@
<%= number_to_human_size(file.filesize) %> |
- <%= file.attachmentstype.nil? ? l(:lable_unknow_type):file.attachmentstype.typeName %>
+ <%= file.attachmentstype.nil? ? l(:label_unknow_type):file.attachmentstype.typeName %>
<%= render :partial => 'attachments/course_type_edit', :locals => {:attachmenttypes => attachmenttypes,
diff --git a/app/views/files/_sort_by_attachtypel.html.erb b/app/views/files/_sort_by_attachtypel.html.erb
index eb7ffffec..6c6e11791 100644
--- a/app/views/files/_sort_by_attachtypel.html.erb
+++ b/app/views/files/_sort_by_attachtypel.html.erb
@@ -37,7 +37,7 @@
| <%= number_to_human_size(file.filesize) %> |
- <%= file.attachmentstype.nil? ? l(:lable_unknow_type):file.attachmentstype.typeName %>
+ <%= file.attachmentstype.nil? ? l(:label_unknow_type):file.attachmentstype.typeName %>
<%= render :partial => 'attachments/type_edit', :locals => {:attachmenttypes => attachmenttypes,
diff --git a/app/views/forums/_form.html.erb b/app/views/forums/_form.html.erb
index 993563954..c253e8d78 100644
--- a/app/views/forums/_form.html.erb
+++ b/app/views/forums/_form.html.erb
@@ -21,7 +21,7 @@
<%= f.text_area :description, :required => true, :id => 'editor01' %>
- (<%= l(:lable_forums_max_length) %>)
+ (<%= l(:label_forums_max_length) %>)
<%= submit_tag l(:button_submit) %>
diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb
index 48913a38d..1622bbe02 100644
--- a/app/views/forums/show.html.erb
+++ b/app/views/forums/show.html.erb
@@ -18,7 +18,7 @@
<%= f.text_field :subject, :required => true%>
<%= f.text_area :content, :required => true, :id => 'editor02' %>
- (<%= l(:lable_memos_max_length) %>)
+ (<%= l(:label_memos_max_length) %>)
<%= l(:label_attachment_plural) %>
diff --git a/app/views/users/_score_new_index.html.erb b/app/views/users/_score_new_index.html.erb
index b79a57e71..d0647d8e3 100644
--- a/app/views/users/_score_new_index.html.erb
+++ b/app/views/users/_score_new_index.html.erb
@@ -7,7 +7,7 @@
= <%= 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 %>
<% 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 %>
- <%= l(:lable_score_less_than_zero) %>
+ <%= l(:label_score_less_than_zero) %>
<% else %>
= <%= format("%.2f" ,option_num.total_score).to_i %>
<% end %>
diff --git a/app/views/welcome/_course_list.html.erb b/app/views/welcome/_course_list.html.erb
index 0dcf1085a..b6dac9022 100644
--- a/app/views/welcome/_course_list.html.erb
+++ b/app/views/welcome/_course_list.html.erb
@@ -7,7 +7,7 @@
<% unless course.is_public == 1 %>
- <%= l(:lable_private) %>
+ <%= l(:label_private) %>
<% end %>
<%= link_to(course.name.truncate(30, omission: '...')+":", course_path(course.id), :class => "d-g-blue d-p-project-name", :title => "#{course.name}") %>
diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb
index c46df7777..e25ef5665 100644
--- a/app/views/welcome/course.html.erb
+++ b/app/views/welcome/course.html.erb
@@ -92,7 +92,7 @@
<% if User.current.logged? %>
- <%= 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)} %>
<%= 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 %>
- <%= 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)} %>
<%= render :partial => 'course_list', :locals => {:course_list => find_all_new_hot_course(9 - school_course.count, @school_id)} %>
<% end %>
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index fd4a1637e..b73f0970f 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -73,7 +73,7 @@
<% unless project.is_public %>
- <%= l(:lable_private) %>
+ <%= l(:label_private) %>
<% 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' %>)
diff --git a/config/locales/en.yml b/config/locales/en.yml
index ee7e76ed1..987acabc4 100644
--- a/config/locales/en.yml
+++ b/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
\ No newline at end of file
+ label_private: private
\ No newline at end of file
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index a3db5964b..874c9108a 100644
--- a/config/locales/zh.yml
+++ b/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: 私有
diff --git a/public/file_not_found.html.erb b/public/file_not_found.html.erb
index b3b45203a..8cd5e7af6 100644
--- a/public/file_not_found.html.erb
+++ b/public/file_not_found.html.erb
@@ -26,12 +26,12 @@
- <%= l(:lable_file_not_found) %>
-
+ <%= l(:label_file_not_found) %>
+ <%= link_to l(:label_goto_homepage),{:controller=>'welcome',:action=>'index',:host=>Setting.host_name} %>
- <%= l(:lable_trustie_team) %>
+ <%= l(:label_trustie_team) %>
|