mirror of
https://github.com/github/rails.git
synced 2026-04-26 03:00:59 -04:00
subject is automatically looked up on I18n using mailer_name and action_name as scope as in t('.subject')
This commit is contained in:
@@ -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 @@ module ActionMailer #:nodoc:
|
||||
|
||||
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 @@ class BaseTest < ActiveSupport::TestCase
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user