Merge pull request #570 from bagilevi/fix-argument-error-in-fallbacks

Fix ArgumentError when Fallbacks#map used as in Hash

lib/i18n/locale/fallbacks.rb

@@ -64,13 +64,18 @@ def [](locale)
         super || store(locale, compute(locale))
       end
 
-      def map(mappings)
-        mappings.each do |from, to|
-          from, to = from.to_sym, Array(to)
-          to.each do |_to|
-            @map[from] ||= []
-            @map[from] << _to.to_sym
+      def map(*args, &block)
+        if args.count == 1 && !block_given?
+          mappings = args.first
+          mappings.each do |from, to|
+            from, to = from.to_sym, Array(to)
+            to.each do |_to|
+              @map[from] ||= []
+              @map[from] << _to.to_sym
+            end
           end
+        else
+          @map.map(*args, &block)
         end
       end
 

test/locale/fallbacks_test.rb

@@ -159,3 +159,15 @@ def setup
     end
   end
 end
+
+class I18nFallbacksHashCompatibilityTest < I18n::TestCase
+  def setup
+    super
+    @fallbacks = Fallbacks.new(:'en-US', :"de-AT" => :"de-DE")
+  end
+
+  test "map is compatible with Hash#map" do
+    result = @fallbacks.map { |key, value| [key, value] }
+    assert_equal([[:"de-AT", [:"de-DE"]]], result)
+  end
+end