X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5294e4d989038ae20c1e38622d14f5b54c7d830f..a693fc9a3c7f35a567dc3dd07b16adf3991c441c:/config/initializers/action_mailer.rb?ds=sidebyside

diff --git a/config/initializers/action_mailer.rb b/config/initializers/action_mailer.rb
index 37510ac27..e6181072b 100644
--- a/config/initializers/action_mailer.rb
+++ b/config/initializers/action_mailer.rb
@@ -3,36 +3,27 @@ ActionMailer::Base.smtp_settings = {
   :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)
-    end
-  end
-end
-
 # Monkey patch to allow sending of messages in specific locales
 module ActionMailer
   class Base
     adv_attr_accessor :locale
-  private
-    alias_method :old_render_message, :render_message
 
-    def render_message(method_name, body)
+    def mail_with_locale(*args)
       old_locale= I18n.locale
 
       begin
         I18n.locale = @locale
-        message = old_render_message(method_name, body)
+        message = mail_without_locale(*args)
       ensure
         I18n.locale = old_locale
       end
 
       message
     end
+
+    alias_method_chain :mail, :locale
   end
 end