Install the local build of the oauth-plugin gem from git

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

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

+  :enable_starttls_auto => false

 }
 
 }
 

-# Monkey patch to fix return-path bug in ActionMailer 2.2.2
-# Can be removed once we go to 2.3
-module Net
-  class SMTP
-    def sendmail(msgstr, from_addr, *to_addrs)
-      send_message(msgstr, from_addr.to_s.sub(/^<(.*)>$/, "\\1"), *to_addrs)
+# Monkey patch to allow sending of messages in specific locales
+module ActionMailer
+  class Base
+    def mail_with_locale(*args)
+      old_locale = I18n.locale
+
+      begin
+        I18n.locale = @locale
+        message = mail_without_locale(*args)
+      ensure
+        I18n.locale = old_locale
+      end
+
+      message

     end
     end

+
+    alias_method_chain :mail, :locale

   end
 end
   end
 end