aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/CHANGELOG.md
diff options
context:
space:
mode:
authorJohannes Opper <johannes.opper@gmail.com>2015-07-02 14:36:40 +0200
committerJohannes Opper <johannes.opper@gmail.com>2015-07-05 20:21:25 +0200
commitca2387eb0145c0b8639f06ac7acb642fb3755c72 (patch)
tree419ec4b65b40fd9e425581310a5891404a77f809 /actionmailer/CHANGELOG.md
parent776e5991a9abf11818cb803e80976cea8b454c17 (diff)
downloadrails-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/CHANGELOG.md')
-rw-r--r--actionmailer/CHANGELOG.md6
1 files changed, 6 insertions, 0 deletions
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
index 7c1b0b215a..f325cbef81 100644
--- a/actionmailer/CHANGELOG.md
+++ b/actionmailer/CHANGELOG.md
@@ -1,3 +1,9 @@
+* `deliver_later` now respects the current locale.
+
+ Fixes #20774.
+
+ *Johannes Opper*
+
* Add `config.action_mailer.deliver_later_queue_name` configuration to set the
mailer queue name.