Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
41740be7
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,发现更多精彩内容 >>
提交
41740be7
编写于
1月 02, 2015
作者:
R
Rafael Mendonça França
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #18308 from jcoyne/i18n_translate_safety
Unsafe default translations should not be marked html_safe
上级
2ade177b
fab50c13
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
20 addition
and
19 deletion
+20
-19
actionview/CHANGELOG.md
actionview/CHANGELOG.md
+5
-0
actionview/lib/action_view/helpers/translation_helper.rb
actionview/lib/action_view/helpers/translation_helper.rb
+9
-19
actionview/test/template/translation_helper_test.rb
actionview/test/template/translation_helper_test.rb
+6
-0
未找到文件。
actionview/CHANGELOG.md
浏览文件 @
41740be7
*
Default translations that have a lower precidence than an html safe default,
but are not themselves safe, should not be marked as html_safe.
*Justin Coyne*
*
Make possible to use blocks with short version of
`render "partial"`
helper.
*Nikolay Shebanov*
...
...
actionview/lib/action_view/helpers/translation_helper.rb
浏览文件 @
41740be7
...
...
@@ -37,7 +37,8 @@ module TranslationHelper
# you know what kind of output to expect when you call translate in a template.
def
translate
(
key
,
options
=
{})
options
=
options
.
dup
options
[
:default
]
=
wrap_translate_defaults
(
options
[
:default
])
if
options
[
:default
]
remaining_defaults
=
Array
(
options
.
delete
(
:default
))
options
[
:default
]
=
remaining_defaults
.
shift
if
remaining_defaults
.
first
.
kind_of?
String
# If the user has specified rescue_format then pass it all through, otherwise use
# raise and do the work ourselves
...
...
@@ -62,11 +63,15 @@ def translate(key, options = {})
I18n
.
translate
(
scope_key_by_partial
(
key
),
options
)
end
rescue
I18n
::
MissingTranslationData
=>
e
if
remaining_defaults
.
present?
translate
remaining_defaults
.
shift
,
options
.
merge
(
default:
remaining_defaults
)
else
raise
e
if
raise_error
keys
=
I18n
.
normalize_keys
(
e
.
locale
,
e
.
key
,
e
.
options
[
:scope
])
content_tag
(
'span'
,
keys
.
last
.
to_s
.
titleize
,
:class
=>
'translation_missing'
,
:title
=>
"translation missing:
#{
keys
.
join
(
'.'
)
}
"
)
end
end
alias
:t
:translate
# Delegates to <tt>I18n.localize</tt> with no additional functionality.
...
...
@@ -94,21 +99,6 @@ def scope_key_by_partial(key)
def
html_safe_translation_key?
(
key
)
key
.
to_s
=~
/(\b|_|\.)html$/
end
def
wrap_translate_defaults
(
defaults
)
new_defaults
=
[]
defaults
=
Array
(
defaults
)
while
key
=
defaults
.
shift
if
key
.
is_a?
(
Symbol
)
new_defaults
<<
lambda
{
|
_
,
options
|
translate
key
,
options
.
merge
(
:default
=>
defaults
)
}
break
else
new_defaults
<<
key
end
end
new_defaults
end
end
end
end
actionview/test/template/translation_helper_test.rb
浏览文件 @
41740be7
...
...
@@ -145,6 +145,12 @@ def test_translate_with_last_default_named_html
assert_equal
true
,
translation
.
html_safe?
end
def
test_translate_with_last_default_not_named_html
translation
=
translate
(
:'translations.missing'
,
:default
=>
[
:'translations.missing_html'
,
:'translations.foo'
])
assert_equal
'Foo'
,
translation
assert_equal
false
,
translation
.
html_safe?
end
def
test_translate_with_string_default
translation
=
translate
(
:'translations.missing'
,
default:
'A Generic String'
)
assert_equal
'A Generic String'
,
translation
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录