Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
3d8b783d
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,发现更多精彩内容 >>
提交
3d8b783d
编写于
5月 04, 2015
作者:
B
Bernard Potocki
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove :rescue_format option for translate helper since it's no longer supported by I18n.
上级
e5139f17
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
9 addition
and
16 deletion
+9
-16
actionview/CHANGELOG.md
actionview/CHANGELOG.md
+5
-0
actionview/lib/action_view/helpers/translation_helper.rb
actionview/lib/action_view/helpers/translation_helper.rb
+2
-2
actionview/test/template/translation_helper_test.rb
actionview/test/template/translation_helper_test.rb
+2
-14
未找到文件。
actionview/CHANGELOG.md
浏览文件 @
3d8b783d
*
Remove
`:rescue_format`
option for
`translate`
helper since it's no longer
supported by I18n.
*Bernard Potocki*
*
`translate`
should handle
`raise`
flag correctly in case of both main and default
translation is missing.
...
...
actionview/lib/action_view/helpers/translation_helper.rb
浏览文件 @
3d8b783d
...
...
@@ -60,11 +60,11 @@ def translate(key, options = {})
# If the user has explicitly decided to NOT raise errors, pass that option to I18n.
# Otherwise, tell I18n to raise an exception, which we rescue further in this method.
# Note: `raise_error` refers to us re-raising the error in this method. I18n is forced to raise by default.
if
options
[
:raise
]
==
false
||
(
options
.
key?
(
:rescue_format
)
&&
options
[
:rescue_format
].
nil?
)
if
options
[
:raise
]
==
false
raise_error
=
false
i18n_raise
=
false
else
raise_error
=
options
[
:raise
]
||
options
[
:rescue_format
]
||
ActionView
::
Base
.
raise_on_missing_translations
raise_error
=
options
[
:raise
]
||
ActionView
::
Base
.
raise_on_missing_translations
i18n_raise
=
true
end
...
...
actionview/test/template/translation_helper_test.rb
浏览文件 @
3d8b783d
...
...
@@ -41,8 +41,8 @@ class TranslationHelperTest < ActiveSupport::TestCase
I18n
.
backend
.
reload!
end
def
test_delegates_
to_i18n_setting_the_rescue_format_option_to_html
I18n
.
expects
(
:translate
).
with
(
:foo
,
:locale
=>
'en'
,
:raise
=>
true
).
returns
(
""
)
def
test_delegates_
setting_to_i18n
I18n
.
expects
(
:translate
).
with
(
:foo
,
:locale
=>
'en'
,
:raise
=>
true
).
returns
(
""
)
translate
:foo
,
:locale
=>
'en'
end
...
...
@@ -58,12 +58,6 @@ def test_returns_missing_translation_message_wrapped_into_span
assert_equal
true
,
translate
(
:"translations.missing"
).
html_safe?
end
def
test_returns_missing_translation_message_using_nil_as_rescue_format
expected
=
'translation missing: en.translations.missing'
assert_equal
expected
,
translate
(
:"translations.missing"
,
:rescue_format
=>
nil
)
assert_equal
false
,
translate
(
:"translations.missing"
,
:rescue_format
=>
nil
).
html_safe?
end
def
test_raises_missing_translation_message_with_raise_config_option
ActionView
::
Base
.
raise_on_missing_translations
=
true
...
...
@@ -96,12 +90,6 @@ def test_uses_custom_exception_handler_when_specified_for_html
I18n
.
exception_handler
=
old_exception_handler
end
def
test_i18n_translate_defaults_to_nil_rescue_format
expected
=
'translation missing: en.translations.missing'
assert_equal
expected
,
I18n
.
translate
(
:"translations.missing"
)
assert_equal
false
,
I18n
.
translate
(
:"translations.missing"
).
html_safe?
end
def
test_translation_returning_an_array
expected
=
%w(foo bar)
assert_equal
expected
,
translate
(
:"translations.array"
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录