X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/e13337354d005d0fad1e6288ae98d2893a53e02d..8de0c9dd225c0b1bcdc20f4054b087569ace8465:/config/initializers/action_mailer.rb

diff --git a/config/initializers/action_mailer.rb b/config/initializers/action_mailer.rb
index 1467b6fe6..37510ac27 100644
--- a/config/initializers/action_mailer.rb
+++ b/config/initializers/action_mailer.rb
@@ -1,6 +1,38 @@
-# Configure ActionMailer
+# Configure ActionMailer SMTP settings
 ActionMailer::Base.smtp_settings = {
   :address => 'localhost',
   :port => 25, 
   :domain => 'localhost',
 }
+
+# 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)
+      old_locale= I18n.locale
+
+      begin
+        I18n.locale = @locale
+        message = old_render_message(method_name, body)
+      ensure
+        I18n.locale = old_locale
+      end
+
+      message
+    end
+  end
+end