Permalink
Browse files

subject is automatically looked up on I18n using mailer_name and acti…

…on_name as scope as in t('.subject')
  • Loading branch information...
1 parent b308a60 commit 30eaecb3df707ec45859ab1cddb122f811c043a1 @josevalim josevalim committed Jun 12, 2010
Showing with 4 additions and 2 deletions.
  1. +2 −0 actionmailer/CHANGELOG
  2. +1 −1 actionmailer/lib/action_mailer/base.rb
  3. +1 −1 actionmailer/test/base_test.rb
View
@@ -1,5 +1,7 @@
*Rails 3.0.0 [beta 4] (June 8th, 2010)*
+* subject is automatically looked up on I18n using mailer_name and action_name as scope as in t(".subject") [JK]
+
* Changed encoding behaviour of mail, so updated tests in actionmailer and bumped mail version to 2.2.1 [ML]
* Added ability to pass Proc objects to the defaults hash [ML]
@@ -657,7 +657,7 @@ def set_content_type(m, user_content_type, class_default)
def default_i18n_subject #:nodoc:
mailer_scope = self.class.mailer_name.gsub('/', '.')
- I18n.t(:subject, :scope => [:actionmailer, mailer_scope, action_name], :default => action_name.humanize)
+ I18n.t(:subject, :scope => [mailer_scope, action_name], :default => action_name.humanize)
end
def collect_responses_and_parts_order(headers) #:nodoc:
@@ -325,7 +325,7 @@ def give_a_greeting
email = BaseMailer.welcome(:subject => nil)
assert_equal "Welcome", email.subject
- I18n.backend.store_translations('en', :actionmailer => {:base_mailer => {:welcome => {:subject => "New Subject!"}}})
+ I18n.backend.store_translations('en', :base_mailer => {:welcome => {:subject => "New Subject!"}})
email = BaseMailer.welcome(:subject => nil)
assert_equal "New Subject!", email.subject
end

0 comments on commit 30eaecb

Please sign in to comment.