X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d6e605414d88a1917bd204522b0df68ea47fec11..129d505d9117ad05abe6bbc4d1936fd9b6f7bc2a:/config/initializers/action_mailer.rb

diff --git a/config/initializers/action_mailer.rb b/config/initializers/action_mailer.rb
index 98b599ce9..ad729174f 100644
--- a/config/initializers/action_mailer.rb
+++ b/config/initializers/action_mailer.rb
@@ -1,16 +1,27 @@
-# Configure ActionMailer
+# Configure ActionMailer SMTP settings
 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)
+# 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
+
+    alias_method_chain :mail, :locale
   end
 end