diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2010-05-24 20:16:50 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2010-05-24 20:30:21 -0700 |
| commit | f53a6d814966e0ea039bde680b0fc3814236641c (patch) | |
| tree | af1afb10e38efd66514f4f692b17ed0e221d1a45 /actionpack/lib/action_view/helpers | |
| parent | d8d38bedfd5716d55e50e85dc6c9a938b1848e66 (diff) | |
| download | rails-f53a6d814966e0ea039bde680b0fc3814236641c.tar.gz rails-f53a6d814966e0ea039bde680b0fc3814236641c.tar.bz2 rails-f53a6d814966e0ea039bde680b0fc3814236641c.zip | |
i18n: t() handles single keys returning an Array, also
Diffstat (limited to 'actionpack/lib/action_view/helpers')
| -rw-r--r-- | actionpack/lib/action_view/helpers/translation_helper.rb | 7 |
1 files changed, 5 insertions, 2 deletions
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 |