Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Revert "translation method of TranslationHelper module returns always…

… SafeBuffer [#4194 status:resolved]"

This reverts commit 2310aef.

Signed-off-by: José Valim <jose.valim@gmail.com>
  • Loading branch information...
commit d3da1a2c66ea68b88b6d99b252babf7ea2950aa1 1 parent 8e6a044
Santiago Pastorino spastorino authored josevalim committed
2  actionpack/lib/action_view/helpers/translation_helper.rb
View
@@ -13,7 +13,7 @@ module TranslationHelper
def translate(key, options = {})
options[:raise] = true
translation = I18n.translate(scope_key_by_partial(key), options)
- (translation.respond_to?(:join) ? translation.join : translation).html_safe
+ translation.respond_to?(:html_safe) ? translation.html_safe : translation
rescue I18n::MissingTranslationData => e
keys = I18n.send(:normalize_translation_keys, e.locale, e.key, e.options[:scope])
content_tag('span', keys.join(', '), :class => 'translation_missing')
1  actionpack/test/fixtures/test/array_translation.erb
View
@@ -1 +0,0 @@
-<%= t(['foo', 'bar']) %>
9 actionpack/test/template/translation_helper_test.rb
View
@@ -20,14 +20,7 @@ def test_returns_missing_translation_message_wrapped_into_span
def test_translation_of_an_array
I18n.expects(:translate).with(["foo", "bar"], :raise => true).returns(["foo", "bar"])
- assert_equal "foobar", translate(["foo", "bar"])
- end
-
- def test_translation_of_an_array_with_html
- expected = '<a href="#">foo</a><a href="#">bar</a>'
- I18n.expects(:translate).with(["foo", "bar"], :raise => true).returns(['<a href="#">foo</a>', '<a href="#">bar</a>'])
- @view = ActionView::Base.new(ActionController::Base.view_paths, {})
- assert_equal expected, @view.render(:file => "test/array_translation")
+ assert_equal ["foo", "bar"], translate(["foo", "bar"])
end
def test_delegates_localize_to_i18n
Please sign in to comment.
Something went wrong with that request. Please try again.