aboutsummaryrefslogtreecommitdiffstats
path: root/activejob/lib
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-03-09 14:56:36 -0300
committerRafael França <rafaelmfranca@gmail.com>2016-03-09 14:56:36 -0300
commit0934b9e7cf904230b261029a60fb264b75001a37 (patch)
treeb6583f9bf42a16a1d32a1c6cb132567b4bad7c13 /activejob/lib
parent1e92fe73522b58c353746aef30c395574ec1cdaf (diff)
parent8c98186742c5fd3301906c85117f50973989c3dd (diff)
downloadrails-0934b9e7cf904230b261029a60fb264b75001a37.tar.gz
rails-0934b9e7cf904230b261029a60fb264b75001a37.tar.bz2
rails-0934b9e7cf904230b261029a60fb264b75001a37.zip
Merge pull request #24123 from mperham/master
Job payload should be symmetric across JSON dump/load
Diffstat (limited to 'activejob/lib')
-rw-r--r--activejob/lib/active_job/core.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activejob/lib/active_job/core.rb b/activejob/lib/active_job/core.rb
index 19b900a285..f7f882c998 100644
--- a/activejob/lib/active_job/core.rb
+++ b/activejob/lib/active_job/core.rb
@@ -79,7 +79,7 @@ module ActiveJob
'queue_name' => queue_name,
'priority' => priority,
'arguments' => serialize_arguments(arguments),
- 'locale' => I18n.locale
+ 'locale' => I18n.locale.to_s
}
end
@@ -108,7 +108,7 @@ module ActiveJob
self.queue_name = job_data['queue_name']
self.priority = job_data['priority']
self.serialized_arguments = job_data['arguments']
- self.locale = job_data['locale'] || I18n.locale
+ self.locale = job_data['locale'] || I18n.locale.to_s
end
private