diff options
| author | Rizwan Reza <rizwanreza@gmail.com> | 2010-06-14 13:13:13 +0430 |
|---|---|---|
| committer | Rizwan Reza <rizwanreza@gmail.com> | 2010-06-14 13:13:13 +0430 |
| commit | bf7429041e64ee0f347764a4579c8c1d14d5b391 (patch) | |
| tree | e52044f40d8ea2310aef97790b5374ac8b8558a4 /actionmailer/lib/action_mailer/base.rb | |
| parent | 4b05de19aaebcbe20941e8b13aaed2060759ed1c (diff) | |
| parent | c125116013d4b4222f507cfbd1da5ae90bd225d9 (diff) | |
| download | rails-bf7429041e64ee0f347764a4579c8c1d14d5b391.tar.gz rails-bf7429041e64ee0f347764a4579c8c1d14d5b391.tar.bz2 rails-bf7429041e64ee0f347764a4579c8c1d14d5b391.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'actionmailer/lib/action_mailer/base.rb')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 7da033b6af..8c5c838384 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -60,21 +60,21 @@ module ActionMailer #:nodoc: # # If you want to explicitly render only certain templates, pass a block: # - # mail(:to => user.emai) do |format| + # mail(:to => user.email) do |format| # format.text # format.html # end # # The block syntax is useful if also need to specify information specific to a part: # - # mail(:to => user.emai) do |format| + # mail(:to => user.email) do |format| # format.text(:content_transfer_encoding => "base64") # format.html # end # # Or even to render a special view: # - # mail(:to => user.emai) do |format| + # mail(:to => user.email) do |format| # format.text # format.html { render "some_other_template" } # end @@ -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: |