Fix bulk lookups in Chain backend.

Signed-off-by: José Valim <jose.valim@gmail.com>

lib/i18n/backend/chain.rb

@@ -39,20 +39,25 @@ def available_locales
         end
 
         def translate(locale, key, options = {})
-          default = options.delete(:default)
           namespace = {}
-          backends.each do |backend|
-            begin
-              options.update(:default => default) if default and backend == backends.last
-              translation = backend.translate(locale, key, options)
-              if namespace_lookup?(translation, options)
-                namespace.update(translation)
-              elsif !translation.nil?
-                return translation
+          default = options.delete(:default)
+          begin
+            backends.each do |backend|
+              begin
+                options.update(:default => default) if default and backend == backends.last
+                translation = backend.translate(locale, key, options)
+                if namespace_lookup?(translation, options)
+                  namespace.update(translation)
+                elsif !translation.nil?
+                  return translation
+                end
+              rescue MissingTranslationData
               end
-            rescue MissingTranslationData
             end
+          ensure
+            options.update(:default => default)
           end
+
           return namespace unless namespace.empty?
           raise(I18n::MissingTranslationData.new(locale, key, options))
         end

test/backend/chain_test.rb

@@ -51,6 +51,8 @@ def setup
 
   test "bulk lookup collects results from all backends" do
     assert_equal ['Foo', 'Bar'], I18n.t([:foo, :bar])
+    assert_equal ['Foo', 'Bar', 'Bah'], I18n.t([:foo, :bar, :bah], :default => 'Bah')
+    assert_equal [{ :short => 'short', :long => 'long' }, { :one => 'one' }, 'Bah'], I18n.t([:formats, :plural_2, :bah], :default => 'Bah')
   end
 
   protected