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

app/models/course.rb

@@ -34,7 +34,7 @@ class Course < ActiveRecord::Base
                      :delete_permission => :manage_files
 
   validates_presence_of :password, :term
-  validates_format_of  :class_period, :message => l(:error_class_period_only_num), :with =>/^[1-9]\d*$/
+  validates_format_of  :class_period, :with =>/^[1-9]\d*$/
 
   after_save :create_board_sync
   before_destroy :delete_all_members

app/views/news/_course_news.html.erb

@@ -76,7 +76,7 @@
       <%= stylesheet_link_tag 'scm' %>
   <% end %>
 
-  <% html_title(l(:label_news_plural)) -%>
+  <% html_title(l(:label_course_news)) -%>
 </div>
 
 <script type='text/javascript'>

config/locales/zh.yml

@@ -282,6 +282,7 @@ zh:
   field_role: 角色
   field_homepage: 主页
   field_time: 课时
+  field_class_period: 学时
   field_code: 学分
   field_is_public: 公开
   field_parent: 上级项目