Enable parallel tests

[rails.git] / config / initializers / action_mailer.rb

diff --git a/config/initializers/action_mailer.rb b/config/initializers/action_mailer.rb
index e6181072bcb46e12390997d1767907c106fb8c1b..32dfa79bbfea05f7de1396385727e8debec7baf8 100644 (file)
--- a/config/initializers/action_mailer.rb
+++ b/config/initializers/action_mailer.rb
@@ -1,29 +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
-    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
+# Set the host and protocol for all ActionMailer URLs
+ActionMailer::Base.default_url_options = {
+  :host => Settings.server_url,
+  :protocol => Settings.server_protocol
+}