diff options
| author | Sven Fuchs <svenfuchs@artweb-design.de> | 2008-07-02 19:21:07 +0200 |
|---|---|---|
| committer | Sven Fuchs <svenfuchs@artweb-design.de> | 2008-07-02 19:21:07 +0200 |
| commit | 8f74ba96c47e77e18ce363c8e7cd2fc9196faf7a (patch) | |
| tree | d3ea17f604e93db745ee74ee21dc7cafa76bc81d /actionmailer | |
| parent | 7403c825a05af320e20f1b7e20b0c565081ede89 (diff) | |
| download | rails-8f74ba96c47e77e18ce363c8e7cd2fc9196faf7a.tar.gz rails-8f74ba96c47e77e18ce363c8e7cd2fc9196faf7a.tar.bz2 rails-8f74ba96c47e77e18ce363c8e7cd2fc9196faf7a.zip | |
remove core extensions in favor of I18n#translate and I18n#localize
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index e787c1b8da..f7da90d10f 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -349,7 +349,7 @@ module ActionMailer #:nodoc: # the current locale, and, finally, on the +default_charset+ specified # for ActionMailer::Base. def charset(charset = nil) - @charset ||= charset || :'charset'.t || @@default_charset + @charset ||= charset || I18n.translate(:charset) || @@default_charset end attr_writer :charset |