TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Do not always mark the default translation as html safe

Browse Source 
If the `_html` suffis isn't provided we should not mark the default
translation as html safe and escape it.
This commit is contained in:
Rafael Mendonça França 2024-02-27 01:34:54 +00:00
parent c402ec7872
commit d216d1ede7
No known key found for this signature in database
GPG Key ID: FC23B6D0F1EEE948
3 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
actionpack/lib/abstract_controller/translation.rb
View File

@ -23,10 +23,12 @@ def translate(key, **options)
key = "#{path}.#{action_name}#{key}"
end
if options[:default]
options[:default] = [options[:default]] unless options[:default].is_a?(Array)
options[:default] = options[:default].map do |value|
value.is_a?(String) ? ERB::Util.html_escape(value) : value
if ActiveSupport::HtmlSafeTranslation.html_safe_translation_key?(key)
if options[:default]
options[:default] = [options[:default]] unless options[:default].is_a?(Array)
options[:default] = options[:default].map do |value|
value.is_a?(String) ? ERB::Util.html_escape(value) : value
end
end
end

20
actionpack/test/abstract/translation_test.rb
View File

@ -83,17 +83,33 @@ def test_default_translation
end
end
def test_default_translation_as_safe_html
def test_default_translation_as_unsafe_html
@controller.stub :action_name, :index do
translation = @controller.t(".twoz", default: ["<tag>"])
assert_equal "<tag>", translation
assert_equal false, translation.html_safe?
end
end
def test_default_translation_as_safe_html
@controller.stub :action_name, :index do
translation = @controller.t(".twoz_html", default: ["<tag>"])
assert_equal "&lt;tag&gt;", translation
assert_equal true, translation.html_safe?
end
end
def test_default_translation_with_raise_as_safe_html
def test_default_translation_with_raise_as_unsafe_html
@controller.stub :action_name, :index do
translation = @controller.t(".twoz", raise: true, default: ["<tag>"])
assert_equal "<tag>", translation
assert_equal false, translation.html_safe?
end
end
def test_default_translation_with_raise_as_safe_html
@controller.stub :action_name, :index do
translation = @controller.t(".twoz_html", raise: true, default: ["<tag>"])
assert_equal "&lt;tag&gt;", translation
assert_equal true, translation.html_safe?
end

8
activesupport/lib/active_support/html_safe_translation.rb
View File

@ -24,11 +24,11 @@ def translate(key, **options)
end
end
private
def html_safe_translation_key?(key)
/(?:_|\b)html\z/.match?(key)
end
def html_safe_translation_key?(key)
/(?:_|\b)html\z/.match?(key)
end
private
def html_escape_translation_options(options)
options.each do |name, value|
unless i18n_option?(name) || (name == :count && value.is_a?(Numeric))