@@ -465,8 +465,8 @@ module ActionMailer #:nodoc: create_parts # Set the subject if not set yet - @subject ||= I18n.t(method_name, :scope => [:actionmailer, :subjects, mailer_name], - :default => method_name.humanize) + @subject ||= I18n.t(:subject, :scope => [:actionmailer, mailer_name, method_name], + :default => method_name.humanize) # build the mail object itself @mail = create_mail actionmailer/lib/action_mailer/base.rb @@ -402,7 +402,7 @@ class ActionMailerTest < Test::Unit::TestCase assert_nothing_raised { TestMailer.deliver_subject_with_i18n(@recipient) } assert_equal "Subject with i18n", ActionMailer::Base.deliveries.first.subject - I18n.backend.store_translations('en', :actionmailer => {:subjects => {:test_mailer => {:subject_with_i18n => "New Subject!"}}}) + I18n.backend.store_translations('en', :actionmailer => {:test_mailer => {:subject_with_i18n => {:subject => "New Subject!"}}}) assert_nothing_raised { TestMailer.deliver_subject_with_i18n(@recipient) } assert_equal "New Subject!", ActionMailer::Base.deliveries.last.subject end actionmailer/test/mail_service_test.rb 83f329f5f30567a10bc96410da230bf986db8ad4 José Valim jose.valim@gmail.com http://github.com/rails/rails/commit/4a1f43878105d701fd2dd769ec3cf7e81d133c09 4a1f43878105d701fd2dd769ec3cf7e81d133c09 2009-11-09T10:57:53-08:00 2009-11-09T10:35:31-08:00 Change mailer subjects lookup. 6265b931ce5c5d26506914b5fb7eb9323ba41adb Yehuda Katz wycats@Yehuda-Katz.local