lib/traco/locale_fallbacks.rb in traco-3.1.6 vs lib/traco/locale_fallbacks.rb in traco-3.2.0

@@ -11,32 +11,34 @@
 
     attr_reader :fallback_option
     private :fallback_option
 
     def initialize(fallback_option)
-      @fallback_option = validate_option(fallback_option)
+      validate_option(fallback_option)
+
+      @fallback_option = fallback_option
       @default_locale = I18n.default_locale
       @available_locales = I18n.available_locales.sort
     end
 
     def [](current_locale)
       case fallback_option
       when DEFAULT_FALLBACK       then [ current_locale, @default_locale ]
       when ANY_FALLBACK           then [ current_locale, @default_locale, *@available_locales ].uniq
       when NO_FALLBACK            then [ current_locale ]
       when DEFAULT_FIRST_FALLBACK then [ @default_locale, *@available_locales ].uniq
+      when Array                  then fallback_option
       else                        raise "Unknown fallback."  # Should never get here.
       end
     end
 
     private
 
     def validate_option(fallback_option)
-      if OPTIONS.include?(fallback_option)
-        fallback_option
-      else
-        valids = OPTIONS.map(&:inspect).join(", ")
-        raise ArgumentError.new("Unsupported fallback: #{fallback_option.inspect} (expected one of #{valids})")
-      end
+      return if OPTIONS.include?(fallback_option)
+      return if fallback_option.is_a?(Array)
+
+      valids = OPTIONS.map(&:inspect).join(", ")
+      raise ArgumentError.new("Unsupported fallback: #{fallback_option.inspect} (expected one of #{valids}, or an array)")
     end
   end
 end