Ensure templates like template.html are found but still uses the proper virtual path.

4 files changed, 15 insertions, 3 deletions

diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb
index fb42ccb8aa..c11081072d 100644
--- a/actionmailer/test/base_test.rb
+++ b/actionmailer/test/base_test.rb
@@ -209,6 +209,12 @@ class BaseTest < ActiveSupport::TestCase
     assert_equal "New Subject!", email.subject
   end
 
+  test "translations are scoped properly" do
+    I18n.backend.store_translations('en', :base_mailer => {:email_with_translations => {:greet_user => "Hello %{name}!"}})
+    email = BaseMailer.email_with_translations
+    assert_equal 'Hello lifo!', email.body.encoded
+  end
+
   # Implicit multipart
   test "implicit multipart" do
     email = BaseMailer.implicit_multipart
diff --git a/actionmailer/test/fixtures/base_mailer/email_with_translations.html.erb b/actionmailer/test/fixtures/base_mailer/email_with_translations.html.erb
new file mode 100644
index 0000000000..30466dd005
--- /dev/null
+++ b/actionmailer/test/fixtures/base_mailer/email_with_translations.html.erb
@@ -0,0 +1 @@
+<%= t('.greet_user', :name => 'lifo') %>
\ No newline at end of file
diff --git a/actionmailer/test/mailers/base_mailer.rb b/actionmailer/test/mailers/base_mailer.rb
index 2c6de36ccf..e89a5820cc 100644
--- a/actionmailer/test/mailers/base_mailer.rb
+++ b/actionmailer/test/mailers/base_mailer.rb
@@ -111,4 +111,8 @@ class BaseMailer < ActionMailer::Base
       format.html { render :layout => layout_name }
     end
   end
+
+  def email_with_translations
+    body render("email_with_translations.html")
+  end
 end
diff --git a/actionpack/lib/action_view/template.rb b/actionpack/lib/action_view/template.rb
index 40ff1f2182..7decec24ab 100644
--- a/actionpack/lib/action_view/template.rb
+++ b/actionpack/lib/action_view/template.rb
@@ -113,12 +113,13 @@ module ActionView
       @identifier         = identifier
       @handler            = handler
       @original_encoding  = nil
-
-      @virtual_path = details[:virtual_path]
-      @method_names = {}
+      @method_names       = {}
 
       format   = details[:format] || :html
       @formats = Array.wrap(format).map(&:to_sym)
+
+      @virtual_path = details[:virtual_path]
+      @virtual_path.sub!(".#{format}", "") if @virtual_path
     end
 
     def render(view, locals, &block)