diff options
| author | Sven Fuchs <svenfuchs@artweb-design.de> | 2008-07-04 22:26:53 +0200 |
|---|---|---|
| committer | Sven Fuchs <svenfuchs@artweb-design.de> | 2008-07-04 22:26:53 +0200 |
| commit | 8305d6759abe2b8511ccee35fd0998e6fb0dffd0 (patch) | |
| tree | 1455f973b55eda3591b56367e870c12a5ae7378e /actionmailer/lib | |
| parent | 35bad508162d4bdbc0c24e11db89cfe16159183e (diff) | |
| download | rails-8305d6759abe2b8511ccee35fd0998e6fb0dffd0.tar.gz rails-8305d6759abe2b8511ccee35fd0998e6fb0dffd0.tar.bz2 rails-8305d6759abe2b8511ccee35fd0998e6fb0dffd0.zip | |
Reverting changes to ActionMailer
Revert "Make sure ActionMailer use default charset if no defined by current locale"
This reverts commit d41e4c1c3d6e6259f1cfc0cdbd4fc30fee0f866a.
Diffstat (limited to 'actionmailer/lib')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index a1a7f55d2b..f7da90d10f 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -346,10 +346,10 @@ module ActionMailer #:nodoc: # Specify the charset to use for the message. # It performs a lookup, on the specified charset, then on the charset from - # the current locale, and, in the end, on the +default_charset+ specified + # the current locale, and, finally, on the +default_charset+ specified # for ActionMailer::Base. def charset(charset = nil) - @charset ||= charset || I18n.translate(:charset, :default => @@default_charset) + @charset ||= charset || I18n.translate(:charset) || @@default_charset end attr_writer :charset |