Permalink
Browse files

i18n translate with arrays issue solved

Signed-off-by: Yehuda Katz <yehudakatz@YK.local>
  • Loading branch information...
spastorino authored and Yehuda Katz committed Feb 19, 2010
1 parent ae8c384 commit af05420d6bf7cb1c337e95f9941e7db30c521d31
@@ -12,7 +12,8 @@ module TranslationHelper
# prepend the key with a period, nothing is converted.
def translate(key, options = {})
options[:raise] = true
- I18n.translate(scope_key_by_partial(key), options).html_safe
+ translation = I18n.translate(scope_key_by_partial(key), options)
+ translation.is_a?(Array) ? translation.map { |entry| entry.html_safe } : translation.html_safe
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')
@@ -40,4 +41,4 @@ def scope_key_by_partial(key)
end
end
end
-end
+end
@@ -18,6 +18,11 @@ def test_returns_missing_translation_message_wrapped_into_span
assert_equal expected, translate(:foo)
end
+ def test_translation_of_an_array
+ I18n.expects(:translate).with(["foo", "bar"], :raise => true).returns(["foo", "bar"])
+ assert_equal ["foo", "bar"], translate(["foo", "bar"])
+ end
+
def test_delegates_localize_to_i18n
@time = Time.utc(2008, 7, 8, 12, 18, 38)
I18n.expects(:localize).with(@time)

0 comments on commit af05420

Please sign in to comment.