X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e660e609661edadc1ed5ad49d6e83e936b2f91cd..19c2f6d485baf6ae5986a9eeaed412cb2e2039a1:/config/initializers/action_mailer.rb diff --git a/config/initializers/action_mailer.rb b/config/initializers/action_mailer.rb index ad729174f..32dfa79bb 100644 --- a/config/initializers/action_mailer.rb +++ b/config/initializers/action_mailer.rb @@ -1,27 +1,13 @@ # Configure ActionMailer SMTP settings ActionMailer::Base.smtp_settings = { - :address => 'localhost', - :port => 25, - :domain => 'localhost', + :address => "localhost", + :port => 25, + :domain => "localhost", :enable_starttls_auto => false } -# 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 +# Set the host and protocol for all ActionMailer URLs +ActionMailer::Base.default_url_options = { + :host => Settings.server_url, + :protocol => Settings.server_protocol +}