diff options
| author | Sven Fuchs <svenfuchs@artweb-design.de> | 2008-07-04 22:34:32 +0200 |
|---|---|---|
| committer | Sven Fuchs <svenfuchs@artweb-design.de> | 2008-07-04 22:34:32 +0200 |
| commit | 34bd1e95c7a08c9266fc99281417dad4a19cdf73 (patch) | |
| tree | 3d90b7684fea80045f47f94b7bc6be6a32608e02 /actionmailer/lib | |
| parent | 8305d6759abe2b8511ccee35fd0998e6fb0dffd0 (diff) | |
| download | rails-34bd1e95c7a08c9266fc99281417dad4a19cdf73.tar.gz rails-34bd1e95c7a08c9266fc99281417dad4a19cdf73.tar.bz2 rails-34bd1e95c7a08c9266fc99281417dad4a19cdf73.zip | |
Reverting changes to ActionMailer
Revert "Experimental I18n charset support for ActionMailer"
This reverts commit 6982acb0793fb6e59f52cab4062344a88e3691ce.
Conflicts:
actionmailer/lib/action_mailer/base.rb
Diffstat (limited to 'actionmailer/lib')
| -rwxr-xr-x | actionmailer/lib/action_mailer.rb | 4 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 9 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer/locale/en-US.rb | 3 |
3 files changed, 0 insertions, 16 deletions
diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb index 806edf1f9e..2e324d4637 100755 --- a/actionmailer/lib/action_mailer.rb +++ b/actionmailer/lib/action_mailer.rb @@ -49,8 +49,4 @@ ActionMailer::Base.class_eval do helper MailHelper end -I18n.backend.populate do - require 'action_mailer/locale/en-US.rb' -end - silence_warnings { TMail::Encoder.const_set("MAX_LINE_LEN", 200) } diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index f7da90d10f..b1f23583a6 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -344,15 +344,6 @@ module ActionMailer #:nodoc: # have multiple mailer methods share the same template. adv_attr_accessor :template - # 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, finally, on the +default_charset+ specified - # for ActionMailer::Base. - def charset(charset = nil) - @charset ||= charset || I18n.translate(:charset) || @@default_charset - end - attr_writer :charset - # Override the mailer name, which defaults to an inflected version of the # mailer's class name. If you want to use a template in a non-standard # location, you can use this to specify that location. diff --git a/actionmailer/lib/action_mailer/locale/en-US.rb b/actionmailer/lib/action_mailer/locale/en-US.rb deleted file mode 100644 index 369f2d1a1c..0000000000 --- a/actionmailer/lib/action_mailer/locale/en-US.rb +++ /dev/null @@ -1,3 +0,0 @@ -I18n.backend.store_translations :'en-US', { - :charset => 'utf-8' -}
\ No newline at end of file |