From e753ff9615b0bd450b8208ac25a50abdec1d077a Mon Sep 17 00:00:00 2001
From: Mike Perham <mperham@gmail.com>
Date: Wed, 19 Jun 2013 08:33:28 -0700
Subject: [PATCH] Dont save i18n locale if already set, fixes #1011

---
 Changes.md                     | 3 ++-
 lib/sidekiq/middleware/i18n.rb | 2 +-
 lib/sidekiq/version.rb         | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Changes.md b/Changes.md
index 00b0fc5b..ee98f666 100644
--- a/Changes.md
+++ b/Changes.md
@@ -1,7 +1,8 @@
 HEAD
 -----------
 
-- log rotation via USR2 didn't close the old logger [#1008]
+- fix i18n support resetting saved locale when job is retried [#1011]
+- log rotation via USR2 now closes the old logger [#1008]
 
 2.12.4
 -----------
diff --git a/lib/sidekiq/middleware/i18n.rb b/lib/sidekiq/middleware/i18n.rb
index c7cb0ac1..262cb2c9 100644
--- a/lib/sidekiq/middleware/i18n.rb
+++ b/lib/sidekiq/middleware/i18n.rb
@@ -3,7 +3,7 @@ module Sidekiq::Middleware::I18n
   # to be sent to Sidekiq.
   class Client
     def call(worker_class, msg, queue)
-      msg['locale'] = I18n.locale
+      msg['locale'] ||= I18n.locale
       yield
     end
   end
diff --git a/lib/sidekiq/version.rb b/lib/sidekiq/version.rb
index c592f436..9b1cae80 100644
--- a/lib/sidekiq/version.rb
+++ b/lib/sidekiq/version.rb
@@ -1,3 +1,3 @@
 module Sidekiq
-  VERSION = "2.12.4"
+  VERSION = "2.12.5"
 end