X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/983dbb5353f819c513cd36a25321e2714d27b3ac..399fe3c12a7612f1ad79d376f2859d9c6fd38839:/config/initializers/action_mailer.rb?ds=sidebyside diff --git a/config/initializers/action_mailer.rb b/config/initializers/action_mailer.rb index e6ef8a1c8..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 - 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