diff options
author | Johannes Opper <johannes.opper@gmail.com> | 2015-07-07 21:52:28 +0200 |
---|---|---|
committer | Johannes Opper <johannes.opper@gmail.com> | 2015-08-04 00:38:18 +0200 |
commit | 3860e6b2bf486d8b27d433daab358dbc68ae3448 (patch) | |
tree | 136f0b6e7cfeac3ef48ea1c41c37332083dba8d2 /activejob/lib/active_job/core.rb | |
parent | e598967548114da4f8d85070584460108a7305ff (diff) | |
download | rails-3860e6b2bf486d8b27d433daab358dbc68ae3448.tar.gz rails-3860e6b2bf486d8b27d433daab358dbc68ae3448.tar.bz2 rails-3860e6b2bf486d8b27d433daab358dbc68ae3448.zip |
Fixes #20799
When `#perform_later` is called the locale isn't stored on the
queue, which results in a locale reset when the job is performed.
An example of the problem:
I18n.locale = 'de'
HelloJob.perform_now # german message, correct
but
I18n.locale = 'de'
HelloJob.perform_later # english message, incorrect
This PR attaches the current I18n.locale to every job during the
serialization process. It is then restored during deserialization
and used to perform the job with the correct locale.
It falls back to the default locale if no serialized locale is
found in order to provide backward compatibility with previously
stored jobs. It is not necessary to clear the queue for the update.
Diffstat (limited to 'activejob/lib/active_job/core.rb')
-rw-r--r-- | activejob/lib/active_job/core.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/activejob/lib/active_job/core.rb b/activejob/lib/active_job/core.rb index 0528572cd0..eac7279309 100644 --- a/activejob/lib/active_job/core.rb +++ b/activejob/lib/active_job/core.rb @@ -20,6 +20,9 @@ module ActiveJob # ID optionally provided by adapter attr_accessor :provider_job_id + + # I18n.locale to be used during the job. + attr_accessor :locale end # These methods will be included into any Active Job object, adding @@ -68,7 +71,8 @@ module ActiveJob 'job_class' => self.class.name, 'job_id' => job_id, 'queue_name' => queue_name, - 'arguments' => serialize_arguments(arguments) + 'arguments' => serialize_arguments(arguments), + 'locale' => I18n.locale } end @@ -96,6 +100,7 @@ module ActiveJob self.job_id = job_data['job_id'] self.queue_name = job_data['queue_name'] self.serialized_arguments = job_data['arguments'] + self.locale = job_data['locale'] || I18n.locale end private |