Correct misspellings of CC BY[-SA]

[rails.git] / config / initializers / action_mailer.rb

diff --git a/config/initializers/action_mailer.rb b/config/initializers/action_mailer.rb
index 5221ab22a6fb4e2c08c8cd87a2954dbcf38addbe..ad729174fde5e8b427d7c14d84f66d18e78e2fd2 100644 (file)
--- a/config/initializers/action_mailer.rb
+++ b/config/initializers/action_mailer.rb
@@ -3,15 +3,14 @@ ActionMailer::Base.smtp_settings = {
   :address => 'localhost',
   :port => 25, 
   :domain => 'localhost',
   :address => 'localhost',
   :port => 25, 
   :domain => 'localhost',

+  :enable_starttls_auto => false

 }
 
 # Monkey patch to allow sending of messages in specific locales
 module ActionMailer
   class Base
 }
 
 # Monkey patch to allow sending of messages in specific locales
 module ActionMailer
   class Base

-    adv_attr_accessor :locale
-

     def mail_with_locale(*args)
     def mail_with_locale(*args)

-      old_locale= I18n.locale
+      old_locale = I18n.locale

 
       begin
         I18n.locale = @locale
 
       begin
         I18n.locale = @locale