X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/56df4f3813a12a56d9352e5439423de78ed0c7b7..399fe3c12a7612f1ad79d376f2859d9c6fd38839:/config/initializers/action_mailer.rb

diff --git a/config/initializers/action_mailer.rb b/config/initializers/action_mailer.rb
index 5221ab22a..9a8ef011b 100644
--- a/config/initializers/action_mailer.rb
+++ b/config/initializers/action_mailer.rb
@@ -3,26 +3,5 @@ ActionMailer::Base.smtp_settings = {
   :address => 'localhost',
   :port => 25, 
   :domain => 'localhost',
+  :enable_starttls_auto => false
 }
-
-# Monkey patch to allow sending of messages in specific locales
-module ActionMailer
-  class Base
-    adv_attr_accessor :locale
-
-    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