Merge remote branch 'mainstream/master'

Conflicts:
	activerecord/lib/active_record/base.rb
	railties/lib/rails/configuration.rb
	railties/lib/rails/log_subscriber.rb

1 files changed, 5 insertions, 4 deletions

diff --git a/actionpack/lib/action_view/helpers/translation_helper.rb b/actionpack/lib/action_view/helpers/translation_helper.rb
index c348ea7a0d..8a89ee58a0 100644
--- a/actionpack/lib/action_view/helpers/translation_helper.rb
+++ b/actionpack/lib/action_view/helpers/translation_helper.rb
@@ -12,9 +12,10 @@ module ActionView
       # 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])
+        keys = I18n.normalize_keys(e.locale, e.key, e.options[:scope])
         content_tag('span', keys.join(', '), :class => 'translation_missing')
       end
       alias :t :translate
@@ -28,7 +29,7 @@ module ActionView
       private
 
         def scope_key_by_partial(key)
-          if key.to_s.first == "."
+          if (key.respond_to?(:join) ? key.join : key.to_s).first == "."
             if @_virtual_path
               @_virtual_path.gsub(%r{/_?}, ".") + key.to_s
             else
@@ -40,4 +41,4 @@ module ActionView
         end
     end
   end
-end
\ No newline at end of file
+end