Merge pull request rails#40981 from mkasztelnik/40900-fix-lazy-translation-in-partial-with-block

Fix lazy translation in partial with block

Author: rafaelfranca

actionview/lib/action_view/base.rb

@@ -241,12 +241,12 @@ def initialize(lookup_context, assigns, controller) #:nodoc:
     end
 
     def _run(method, template, locals, buffer, add_to_stack: true, &block)
-      _old_output_buffer, _old_template = @output_buffer, @current_template
+      _old_output_buffer, _old_virtual_path, _old_template = @output_buffer, @virtual_path, @current_template
       @current_template = template if add_to_stack
       @output_buffer = buffer
       public_send(method, locals, buffer, &block)
     ensure
-      @output_buffer, @current_template = _old_output_buffer, _old_template
+      @output_buffer, @virtual_path, @current_template = _old_output_buffer, _old_virtual_path, _old_template
     end
 
     def compiled_method_container

actionview/lib/action_view/context.rb

@@ -18,6 +18,7 @@ module Context
     def _prepare_context
       @view_flow     = OutputFlow.new
       @output_buffer = nil
+      @virtual_path  = nil
     end
 
     # Encapsulates the interaction with the view flow so it

actionview/lib/action_view/helpers/translation_helper.rb

@@ -131,10 +131,10 @@ def self.i18n_option?(name)
 
         def scope_key_by_partial(key)
           if key&.start_with?(".")
-            if @current_template&.virtual_path
+            if @virtual_path
               @_scope_key_by_partial_cache ||= {}
-              @_scope_key_by_partial_cache[@current_template.virtual_path] ||= @current_template.virtual_path.gsub(%r{/_?}, ".")
-              "#{@_scope_key_by_partial_cache[@current_template.virtual_path]}#{key}"
+              @_scope_key_by_partial_cache[@virtual_path] ||= @virtual_path.gsub(%r{/_?}, ".")
+              "#{@_scope_key_by_partial_cache[@virtual_path]}#{key}"
             else
               raise "Cannot use t(#{key.inspect}) shortcut because path is not available"
             end

actionview/test/abstract_unit.rb

@@ -59,6 +59,8 @@ def view
   end
 
   def render_erb(string)
+    @virtual_path = nil
+
     template = ActionView::Template.new(
       string.strip,
       "test template",

actionview/test/activerecord/relation_cache_test.rb

@@ -10,6 +10,7 @@ def setup
     view_paths     = ActionController::Base.view_paths
     lookup_context = ActionView::LookupContext.new(view_paths, {}, ["test"])
     @view_renderer = ActionView::Renderer.new(lookup_context)
+    @virtual_path  = "path"
     @current_template = lookup_context.find "test/hello_world"
 
     controller.cache_store = ActiveSupport::Cache::MemoryStore.new

actionview/test/fixtures/translations/templates/_partial.html.erb

@@ -0,0 +1,2 @@
+<%= t('.foo') %>
+<%= yield %>

actionview/test/fixtures/translations/templates/partial_lazy_translation.html.erb

@@ -0,0 +1 @@
+<%= render("translations/templates/partial") %>

actionview/test/fixtures/translations/templates/partial_lazy_translation_block.html.erb

@@ -0,0 +1,2 @@
+<%= render("translations/templates/partial") do %>
+<% end %>

actionview/test/template/template_test.rb

@@ -22,6 +22,7 @@ class Context < ActionView::Base
     def initialize(*)
       super
       @output_buffer = "original"
+      @virtual_path = nil
     end
 
     def hello
@@ -34,7 +35,7 @@ def apostrophe
 
     def partial
       ActionView::Template.new(
-        "<%= @current_template.virtual_path %>",
+        "<%= @virtual_path %>",
         "partial",
         ERBHandler,
         virtual_path: "partial",
@@ -114,9 +115,9 @@ def test_restores_buffer
   end
 
   def test_virtual_path
-    @template = new_template("<%= @current_template.virtual_path %>" \
+    @template = new_template("<%= @virtual_path %>" \
                              "<%= partial.render(self, {}) %>" \
-                             "<%= @current_template.virtual_path %>")
+                             "<%= @virtual_path %>")
     assert_equal "hellopartialhello", render
   end
 

actionview/test/template/translation_helper_test.rb

@@ -23,7 +23,8 @@ class TranslationHelperTest < ActiveSupport::TestCase
           found_yield_single_argument: { foo: "Foo" },
           found_yield_block: { foo: "Foo" },
           array: { foo: { bar: "Foo Bar" } },
-          default: { foo: "Foo" }
+          default: { foo: "Foo" },
+          partial: { foo: "Partial foo" }
         },
         foo: "Foo",
         hello: "<a>Hello World</a>",
@@ -176,6 +177,14 @@ def test_finds_translation_scoped_by_partial_yielding_single_argument_block
     assert_equal "Foo", view.render(template: "translations/templates/found_yield_single_argument").strip
   end
 
+  def test_finds_lazy_translation_scoped_by_partial
+    assert_equal "Partial foo", view.render(template: "translations/templates/partial_lazy_translation").strip
+  end
+
+  def test_finds_lazy_translation_scoped_by_partial_with_block
+    assert_equal "Partial foo", view.render(template: "translations/templates/partial_lazy_translation_block").strip
+  end
+
   def test_finds_translation_scoped_by_partial_yielding_translation_and_key
     assert_equal "translations.templates.found_yield_block.foo: Foo", view.render(template: "translations/templates/found_yield_block").strip
   end