Bounding boxes are sanitised on creation now

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

diff --git a/config/initializers/action_mailer.rb b/config/initializers/action_mailer.rb
index 1467b6fe66d8dfc9f600feb177d09d683ee7707e..e6181072bcb46e12390997d1767907c106fb8c1b 100644 (file)
--- a/config/initializers/action_mailer.rb
+++ b/config/initializers/action_mailer.rb
@@ -1,6 +1,29 @@
-# Configure ActionMailer
+# Configure ActionMailer SMTP settings

 ActionMailer::Base.smtp_settings = {
   :address => 'localhost',
   :port => 25, 
   :domain => 'localhost',
 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