From 900d7d62cb7db2539e5e16559202f623ea6cf390 Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 28 Dec 2015 16:14:32 +0800 Subject: [PATCH] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E6=8C=89=E5=A4=A9=E5=8F=91?= =?UTF-8?q?=E9=80=81=E6=B7=BB=E5=8A=A0=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/mailer.rb | 6 ++++-- config/locales/zh.yml | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/models/mailer.rb b/app/models/mailer.rb index 1cbe7421c..737a1ea69 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -156,7 +156,6 @@ class Mailer < ActionMailer::Base def send_for_user_activities(user, date_to, days) date_from = date_to - days.days subject = "[ #{user.show_name}#{l(:label_day_mail)}]" - @subject = " #{user.show_name}#{l(:label_day_mail)}" date_from = "#{date_from} 17:59:59" date_to = "#{date_to} 17:59:59" # 生成token用于直接点击登录 @@ -268,7 +267,10 @@ class Mailer < ActionMailer::Base has_content = [@issues,@issues_journals,@course_messages,@project_messages,@course_news,@course_news_comments,@project_news,@project_news_comments,@project_attachments, @course_journal_messages,@user_journal_messages,@project_journal_messages,@forums,@memos,@attachments,@bids,@wiki_contents].any? {|o| !o.empty?} - + total_count = @issues.count + @issues_journals.count + @course_messages.count + @project_messages.count + @course_news.count + @course_news_comments.count + @project_news.count + @project_news_comments.count + + @project_attachments.count + @course_journal_messages.count + @user_journal_messages.count + @project_journal_messages.count + @forums.count + @memos.count + @attachments.count + + @bids.count + @wiki_contents.count + @subject = " #{user.show_name}#{l(:label_day_mail_first)}#{total_count}#{l(:label_day_mail_last)}" mylogger.debug "Sent activity mail : #{user.mail} - #{has_content}" #有内容才发，没有不发 mail :to => user.mail,:subject => subject if has_content diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 10241b4b3..230532d71 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -110,6 +110,8 @@ zh: label_week_mail: 一周动态 label_day_mail: 您好！Trustie平台上与您相关的今日动态 + label_day_mail_first: 您好！今天有 + label_day_mail_last: 个动态与您相关，Trustie让您更高效！ #added by huang field_tea_name: 教师 field_couurse_time: 学时