jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
sw 2014-06-26 11:41:10 +08:00
parent c4b2c47dc7 b4af75f289
commit 56ce9e8bdb
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/course.rb
View File

@ -34,7 +34,7 @@ class Course < ActiveRecord::Base
:delete_permission => :manage_files :delete_permission => :manage_files
validates_presence_of :password, :term 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 after_save :create_board_sync
before_destroy :delete_all_members before_destroy :delete_all_members

2
app/views/news/_course_news.html.erb
View File

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

1
config/locales/zh.yml
View File

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