Merge branch 'pr-304'

* pr-304:
  Fix fallbacks when translating key arrays

Fixes #304
Fixes #104

lib/i18n/backend/fallbacks.rb

@@ -38,18 +38,21 @@ def translate(locale, key, options = {})
         return super if options[:fallback]
         default = extract_non_symbol_default!(options) if options[:default]
 
-        options[:fallback] = true
-        I18n.fallbacks[locale].each do |fallback|
-          begin
-            catch(:exception) do
-              result = super(fallback, key, options)
-              return result if (result.nil? && options.key?(:default) && options[:default].nil?) || !result.nil?
+        begin
+          options[:fallback] = true
+          I18n.fallbacks[locale].each do |fallback|
+            begin
+              catch(:exception) do
+                result = super(fallback, key, options)
+                return result if (result.nil? && options.key?(:default) && options[:default].nil?) || !result.nil?
+              end
+            rescue I18n::InvalidLocale
+              # we do nothing when the locale is invalid, as this is a fallback anyways.
             end
-          rescue I18n::InvalidLocale
-            # we do nothing when the locale is invalid, as this is a fallback anyways.
           end
+        ensure
+          options.delete(:fallback)
         end
-        options.delete(:fallback)
 
         return super(locale, nil, options.merge(:default => default)) if default
         throw(:exception, I18n::MissingTranslation.new(locale, key, options))

test/backend/fallbacks_test.rb

@@ -141,6 +141,10 @@ def setup
     assert_equal 'FOO', I18n.t(:foo, :locale => :'de-DE')
   end
 
+  test "falls back from de-DE to de when there is no translation for de-DE available when using arrays, too" do
+    assert_equal ['FOO', 'FOO'], I18n.t([:foo, :foo], :locale => :'de-DE')
+  end
+
   test "should not raise error when enforce_available_locales is true, :'pt' is missing and default is a Symbol" do
     I18n.enforce_available_locales = true
     begin