Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
2aafdc83
R
rails
项目概览
张重言
/
rails
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rails
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
2aafdc83
编写于
10月 28, 2009
作者:
J
José Valim
提交者:
Yehuda Katz
11月 01, 2009
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use I18n on ActionMailer subjects by default.
上级
81c416b7
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
22 addition
and
3 deletion
+22
-3
actionmailer/lib/action_mailer/base.rb
actionmailer/lib/action_mailer/base.rb
+7
-3
actionmailer/test/mail_service_test.rb
actionmailer/test/mail_service_test.rb
+15
-0
未找到文件。
actionmailer/lib/action_mailer/base.rb
浏览文件 @
2aafdc83
...
...
@@ -463,9 +463,9 @@ def create!(method_name, *parameters) #:nodoc:
# Create e-mail parts
create_parts
#
If this is a multipart e-mail add the mime_version if it is no
t
# already set.
@mime_version
||=
"1.0"
if
!
@parts
.
empty?
#
Set the subject if not set ye
t
@subject
||=
I18n
.
t
(
method_name
,
:scope
=>
[
:actionmailer
,
:subjects
,
mailer_name
],
:default
=>
method_name
.
humanize
)
# build the mail object itself
@mail
=
create_mail
...
...
@@ -539,6 +539,10 @@ def create_parts
@content_type
=
"multipart/alternative"
if
@content_type
!~
/^multipart/
@parts
=
sort_parts
(
@parts
,
@implicit_parts_order
)
end
# If this is a multipart e-mail add the mime_version if it is not
# already set.
@mime_version
||=
"1.0"
if
!
@parts
.
empty?
end
end
...
...
actionmailer/test/mail_service_test.rb
浏览文件 @
2aafdc83
...
...
@@ -296,6 +296,12 @@ def body_ivar(recipient)
body
:body
=>
"foo"
,
:bar
=>
"baz"
end
def
subject_with_i18n
(
recipient
)
recipients
recipient
from
"system@loudthinking.com"
render
:text
=>
"testing"
end
class
<<
self
attr_accessor
:received_body
end
...
...
@@ -392,6 +398,15 @@ def test_signed_up
assert_equal
expected
.
encoded
,
ActionMailer
::
Base
.
deliveries
.
first
.
encoded
end
def
test_subject_with_i18n
assert_nothing_raised
{
TestMailer
.
deliver_subject_with_i18n
(
@recipient
)
}
assert_equal
"Subject with i18n"
,
ActionMailer
::
Base
.
deliveries
.
first
.
subject
I18n
.
backend
.
store_translations
(
'en'
,
:actionmailer
=>
{
:subjects
=>
{
:test_mailer
=>
{
:subject_with_i18n
=>
"New Subject!"
}}})
assert_nothing_raised
{
TestMailer
.
deliver_subject_with_i18n
(
@recipient
)
}
assert_equal
"New Subject!"
,
ActionMailer
::
Base
.
deliveries
.
last
.
subject
end
def
test_custom_template
expected
=
new_mail
expected
.
to
=
@recipient
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录