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

10 years ago · 574c7373ec
parent e1636d20d0 f94c13d0e6
commit 574c7373ec
3 changed files with 107 additions and 110 deletions
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@ -107,7 +107,6 @@ class Mailer < ActionMailer::Base
     and (i.created_on between '#{date_from}' and '#{date_to}') order by i.created_on desc"
    @issues = Issue.find_by_sql(sql)
    # @bids 查询课程作业，包括老师发布的作业，以及user提交作业
    # @attachments查询课程课件更新
    @attachments ||= []
--- a/app/views/mailer/send_for_user_activities.html.erb
+++ b/app/views/mailer/send_for_user_activities.html.erb
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@ -736,6 +736,7 @@ zh:
  label_date_to: 到
  label_language_based: 根据用户的语言
  label_mail_policy: 邮件策略
  label_send_test_email: 发送测试邮件
  label_feeds_access_key: RSS存取键
  label_missing_feeds_access_key: 缺少RSS存取键