From 84cab320bc1faaddc142cbbb38713d3f29a8b07d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Thu, 26 Aug 2010 15:19:55 -0300 Subject: Ensure templates like template.html are found but still uses the proper virtual path. --- actionmailer/test/base_test.rb | 6 ++++++ .../test/fixtures/base_mailer/email_with_translations.html.erb | 1 + actionmailer/test/mailers/base_mailer.rb | 4 ++++ 3 files changed, 11 insertions(+) create mode 100644 actionmailer/test/fixtures/base_mailer/email_with_translations.html.erb (limited to 'actionmailer/test') 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 -- cgit v1.2.3