X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/56df4f3813a12a56d9352e5439423de78ed0c7b7..db5c58ed09ed7f767a340ef889a29b6282505b82:/config/initializers/action_mailer.rb?ds=sidebyside diff --git a/config/initializers/action_mailer.rb b/config/initializers/action_mailer.rb index 5221ab22a..ad729174f 100644 --- a/config/initializers/action_mailer.rb +++ b/config/initializers/action_mailer.rb @@ -3,15 +3,14 @@ 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 + old_locale = I18n.locale begin I18n.locale = @locale