From a354699b424d3fa8e5cd4419adf63f570dbbfebc Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 27 Dec 2016 13:02:22 +0800 Subject: [PATCH] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E5=9B=BD=E9=99=85=E5=8C=96?= =?UTF-8?q?=E4=B8=A2=E5=A4=B1=E7=AD=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/mailer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/mailer.rb b/app/models/mailer.rb index 036ee3673..905cac944 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -850,7 +850,7 @@ class Mailer < ActionMailer::Base @token = token @url = url_for(:controller => 'account', :action => 'activate', :token => token.value) mail :to => token.user.mail, - :subject => l(:mail_subject) + :subject => "#{Setting.mail_subject}" end def test_email(user)