Localisation updates from https://translatewiki.net.

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

diff --git a/config/initializers/action_mailer.rb b/config/initializers/action_mailer.rb
index 5221ab22a6fb4e2c08c8cd87a2954dbcf38addbe..6b27bb686fdd348f483e6aeb22ee48c19d0c81ee 100644 (file)
--- a/config/initializers/action_mailer.rb
+++ b/config/initializers/action_mailer.rb
@@ -1,28 +1,7 @@
 # Configure ActionMailer SMTP settings
 ActionMailer::Base.smtp_settings = {
 # 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