diff options
| author | Johannes Opper <johannes.opper@gmail.com> | 2015-07-02 14:36:40 +0200 |
|---|---|---|
| committer | Johannes Opper <johannes.opper@gmail.com> | 2015-07-05 20:21:25 +0200 |
| commit | ca2387eb0145c0b8639f06ac7acb642fb3755c72 (patch) | |
| tree | 419ec4b65b40fd9e425581310a5891404a77f809 /actionmailer/lib/action_mailer/message_delivery.rb | |
| parent | 776e5991a9abf11818cb803e80976cea8b454c17 (diff) | |
| download | rails-ca2387eb0145c0b8639f06ac7acb642fb3755c72.tar.gz rails-ca2387eb0145c0b8639f06ac7acb642fb3755c72.tar.bz2 rails-ca2387eb0145c0b8639f06ac7acb642fb3755c72.zip | |
ActionMailer::MessageDelivery respects current I18n.locale
When #deliver_now is called all translations within the
generated email will be looked up for the current I18n
locale.
I18n.locale = ‘de’
mail.deliver_now # Generates german email, correct
In #enqueue_delivery the locale was not considered and
the resulting job uses the default locale.
I18n.locale = ‘de’
mail.deliver_later # Generate english email, incorrect
In order to achieve a consistent behaviour the current locale
is now always passed to `ActionMailer::DeliveryJob`.
Diffstat (limited to 'actionmailer/lib/action_mailer/message_delivery.rb')
| -rw-r--r-- | actionmailer/lib/action_mailer/message_delivery.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/message_delivery.rb b/actionmailer/lib/action_mailer/message_delivery.rb index ff2cb0fd01..c2479bf651 100644 --- a/actionmailer/lib/action_mailer/message_delivery.rb +++ b/actionmailer/lib/action_mailer/message_delivery.rb @@ -87,7 +87,7 @@ module ActionMailer private def enqueue_delivery(delivery_method, options={}) - args = @mailer.name, @mail_method.to_s, delivery_method.to_s, *@args + args = @mailer.name, @mail_method.to_s, delivery_method.to_s, I18n.locale.to_s, *@args ActionMailer::DeliveryJob.set(options).perform_later(*args) end end |