Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
9c8542bb
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,发现更多精彩内容 >>
提交
9c8542bb
编写于
5月 04, 2015
作者:
B
Bernard Potocki
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Handle raise flag in translate when both main and default translation is missing. Fixes #19967
上级
71669370
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
24 addition
and
4 deletion
+24
-4
actionview/CHANGELOG.md
actionview/CHANGELOG.md
+7
-0
actionview/lib/action_view/helpers/translation_helper.rb
actionview/lib/action_view/helpers/translation_helper.rb
+4
-4
actionview/test/template/translation_helper_test.rb
actionview/test/template/translation_helper_test.rb
+13
-0
未找到文件。
actionview/CHANGELOG.md
浏览文件 @
9c8542bb
*
`translate`
should handle
`raise`
flag correctly in case of both main and default
translation is missing.
Fixes #19967
*Bernard Potocki*
*
Load the
`default_form_builder`
from the controller on initialization, which overrides
the global config if it is present.
...
...
actionview/lib/action_view/helpers/translation_helper.rb
浏览文件 @
9c8542bb
...
...
@@ -62,10 +62,10 @@ def translate(key, options = {})
# 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?
)
raise_error
=
false
options
[
:raise
]
=
false
i18n_raise
=
false
else
raise_error
=
options
[
:raise
]
||
options
[
:rescue_format
]
||
ActionView
::
Base
.
raise_on_missing_translations
options
[
:raise
]
=
true
i18n_raise
=
true
end
if
html_safe_translation_key?
(
key
)
...
...
@@ -75,11 +75,11 @@ def translate(key, options = {})
html_safe_options
[
name
]
=
ERB
::
Util
.
html_escape
(
value
.
to_s
)
end
end
translation
=
I18n
.
translate
(
scope_key_by_partial
(
key
),
html_safe_options
)
translation
=
I18n
.
translate
(
scope_key_by_partial
(
key
),
html_safe_options
.
merge
(
raise:
i18n_raise
)
)
translation
.
respond_to?
(
:html_safe
)
?
translation
.
html_safe
:
translation
else
I18n
.
translate
(
scope_key_by_partial
(
key
),
options
)
I18n
.
translate
(
scope_key_by_partial
(
key
),
options
.
merge
(
raise:
i18n_raise
)
)
end
rescue
I18n
::
MissingTranslationData
=>
e
if
remaining_defaults
.
present?
...
...
actionview/test/template/translation_helper_test.rb
浏览文件 @
9c8542bb
...
...
@@ -157,6 +157,19 @@ def test_translate_with_default_named_html
assert_equal
true
,
translation
.
html_safe?
end
def
test_translate_with_missing_default
translation
=
translate
(
:'translations.missing'
,
:default
=>
:'translations.missing_html'
)
expected
=
'<span class="translation_missing" title="translation missing: en.translations.missing_html">Missing Html</span>'
assert_equal
expected
,
translation
assert_equal
true
,
translation
.
html_safe?
end
def
test_translate_with_missing_default_and_raise_option
assert_raise
(
I18n
::
MissingTranslationData
)
do
translate
(
:'translations.missing'
,
:default
=>
:'translations.missing_html'
,
:raise
=>
true
)
end
end
def
test_translate_with_two_defaults_named_html
translation
=
translate
(
:'translations.missing'
,
:default
=>
[
:'translations.missing_html'
,
:'translations.hello_html'
])
assert_equal
'<a>Hello World</a>'
,
translation
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录