From f53a6d814966e0ea039bde680b0fc3814236641c Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Mon, 24 May 2010 20:16:50 -0700 Subject: i18n: t() handles single keys returning an Array, also --- actionpack/lib/action_view/helpers/translation_helper.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'actionpack/lib/action_view') diff --git a/actionpack/lib/action_view/helpers/translation_helper.rb b/actionpack/lib/action_view/helpers/translation_helper.rb index 6633ef295a..0d2b2aa7b1 100644 --- a/actionpack/lib/action_view/helpers/translation_helper.rb +++ b/actionpack/lib/action_view/helpers/translation_helper.rb @@ -18,7 +18,11 @@ module ActionView def translate(key, options = {}) translation = I18n.translate(scope_key_by_partial(key), options.merge!(:raise => true)) - html_safe_translation_key?(key) ? translation.html_safe : translation + if html_safe_translation_key?(key) && translation.respond_to?(:html_safe) + translation.html_safe + else + translation + end rescue I18n::MissingTranslationData => e keys = I18n.normalize_keys(e.locale, e.key, e.options[:scope]) content_tag('span', keys.join(', '), :class => 'translation_missing') @@ -32,7 +36,6 @@ module ActionView alias :l :localize private - def scope_key_by_partial(key) if key.to_s.first == "." if @_virtual_path -- cgit v1.2.3