scope_key_by_partial fix for Ruby 1.9 when there's virtual_path [#4202 state:resolved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>

3 files changed, 10 insertions, 2 deletions

diff --git a/actionpack/lib/action_view/helpers/translation_helper.rb b/actionpack/lib/action_view/helpers/translation_helper.rb
index 26ba4e2ca4..457944dbb6 100644
--- a/actionpack/lib/action_view/helpers/translation_helper.rb
+++ b/actionpack/lib/action_view/helpers/translation_helper.rb
@@ -29,9 +29,10 @@ module ActionView
       private
 
         def scope_key_by_partial(key)
-          if (key.respond_to?(:join) ? key.join : key.to_s).first == "."
+          strkey = key.respond_to?(:join) ? key.join : key.to_s
+          if strkey.first == "."
             if @_virtual_path
-              @_virtual_path.gsub(%r{/_?}, ".") + key.to_s
+              @_virtual_path.gsub(%r{/_?}, ".") + strkey
             else
               raise "Cannot use t(#{key.inspect}) shortcut because path is not available"
             end
diff --git a/actionpack/test/fixtures/test/scoped_array_translation.erb b/actionpack/test/fixtures/test/scoped_array_translation.erb
new file mode 100644
index 0000000000..0a0c79f717
--- /dev/null
+++ b/actionpack/test/fixtures/test/scoped_array_translation.erb
@@ -0,0 +1 @@
+<%= t(['.foo', '.bar']) %>
\ No newline at end of file
diff --git a/actionpack/test/template/translation_helper_test.rb b/actionpack/test/template/translation_helper_test.rb
index 5a32d71409..6782bf06d4 100644
--- a/actionpack/test/template/translation_helper_test.rb
+++ b/actionpack/test/template/translation_helper_test.rb
@@ -41,4 +41,10 @@ class TranslationHelperTest < ActiveSupport::TestCase
     @view = ActionView::Base.new(ActionController::Base.view_paths, {})
     assert_equal "helper", @view.render(:file => "test/translation")
   end
+
+  def test_scoping_by_partial_of_an_array
+    I18n.expects(:translate).with("test.scoped_array_translation.foo.bar", :raise => true).returns(["foo", "bar"])
+    @view = ActionView::Base.new(ActionController::Base.view_paths, {})
+    assert_equal "foobar", @view.render(:file => "test/scoped_array_translation")
+  end
 end