Fix localization when the Proc gets the object and extra options.

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

lib/i18n/backend/base.rb

@@ -63,7 +63,7 @@ def localize(locale, object, format = :default, options = {})
         if Symbol === format
           key = format
           type = object.respond_to?(:sec) ? 'time' : 'date'
-          format = I18n.t(:"#{type}.formats.#{key}", :locale => locale, :raise => true)
+          format = I18n.t(:"#{type}.formats.#{key}", options.merge(:raise => true, :object => object, :locale => locale))
         end
 
         # format = resolve(locale, object, format, options)
@@ -162,7 +162,8 @@ def resolve(locale, object, subject, options = nil)
           when Symbol
             I18n.translate(subject, (options || {}).merge(:locale => locale, :raise => true))
           when Proc
-            resolve(locale, object, subject.call(object, options), options = {})
+            date_or_time = options.delete(:object) || object
+            resolve(locale, object, subject.call(date_or_time, options), options = {})
           else
             subject
           end

test/api/tests/localization/date.rb

@@ -40,11 +40,6 @@ def setup
           assert_equal 'Mar', I18n.l(@date, :format => '%b', :locale => :de)
         end
 
-        # TODO fails, but something along these lines probably should pass
-        # define_method "test localize Date: given a format that resolves to a Proc it calls the Proc with the object and extra options" do
-        #   assert_equal '[Sat Mar 01 06:00:00 UTC 2008, {:foo=>"foo"}]', I18n.l(@time, :format => :proc, :foo => 'foo', :locale => :de)
-        # end
-
         define_method "test localize Date: given an unknown format it does not fail" do
           assert_nothing_raised { I18n.l(@date, :format => '%x') }
         end

test/api/tests/localization/date_time.rb

@@ -47,19 +47,6 @@ def setup
           assert_equal 'pm', I18n.l(@other_datetime, :format => '%p', :locale => :de)
         end
 
-        # TODO fails, but something along these lines probably should pass
-        # define_method "test localize DateTime: given a format that resolves to a Proc it calls the Proc with the object and extra options" do
-        #   if can_store_procs?
-        #     store_translations :de, :time => { :formats =>
-        #       :long_ordinalized => lambda { |date, options|
-        #         tz = " (#{options[:timezone]})" if options[:timezone]
-        #         "#{date.day}ter %B %Y, %H:%M Uhr#{tz}"
-        #       }
-        #     }
-        #     assert_equal '1ter März 2008, 06:00 Uhr', I18n.l(@datetime, :long_ordinalized)
-        #   end
-        # end
-
         define_method "test localize DateTime: given an unknown format it does not fail" do
           assert_nothing_raised { I18n.l(@datetime, :format => '%x') }
         end

test/api/tests/localization/procs.rb

@@ -35,23 +35,47 @@ module Procs
           if can_store_procs?
             setup_time_proc_translations
             date = ::Date.new(2008, 3, 1, 6)
-            assert_equal '[:"date.formats.proc", {}]', I18n.l(date, :format => :proc, :locale => :ru)
+            assert_equal '[Sat, 01 Mar 2008, {}]', I18n.l(date, :format => :proc, :locale => :ru)
+          end
+        end
+
+        define_method "test localize Date: given a format that resolves to a Proc it calls the Proc with the object and extra options" do
+          if can_store_procs?
+            setup_time_proc_translations
+            date = ::Date.new(2008, 3, 1, 6)
+            assert_equal '[Sat, 01 Mar 2008, {:foo=>"foo"}]', I18n.l(date, :format => :proc, :foo => 'foo', :locale => :ru)
           end
         end
 
         define_method "test localize DateTime: given a format that resolves to a Proc it calls the Proc with the object" do
           if can_store_procs?
             setup_time_proc_translations
             datetime = ::DateTime.new(2008, 3, 1, 6)
-            assert_equal '[:"time.formats.proc", {}]', I18n.l(datetime, :format => :proc, :locale => :ru)
+            assert_equal '[Sat, 01 Mar 2008 06:00:00 +0000, {}]', I18n.l(datetime, :format => :proc, :locale => :ru)
+          end
+        end
+
+        define_method "test localize DateTime: given a format that resolves to a Proc it calls the Proc with the object and extra options" do
+          if can_store_procs?
+            setup_time_proc_translations
+            datetime = ::DateTime.new(2008, 3, 1, 6)
+            assert_equal '[Sat, 01 Mar 2008 06:00:00 +0000, {:foo=>"foo"}]', I18n.l(datetime, :format => :proc, :foo => 'foo', :locale => :ru)
           end
         end
 
         define_method "test localize Time: given a format that resolves to a Proc it calls the Proc with the object" do
           if can_store_procs?
             setup_time_proc_translations
             time = ::Time.parse('2008-03-01 6:00 UTC')
-            assert_equal '[:"time.formats.proc", {}]', I18n.l(time, :format => :proc, :locale => :ru)
+            assert_equal '[Sat Mar 01 06:00:00 UTC 2008, {}]', I18n.l(time, :format => :proc, :locale => :ru)
+          end
+        end
+
+        define_method "test localize Time: given a format that resolves to a Proc it calls the Proc with the object and extra options" do
+          if can_store_procs?
+            setup_time_proc_translations
+            time = ::Time.parse('2008-03-01 6:00 UTC')
+            assert_equal '[Sat Mar 01 06:00:00 UTC 2008, {:foo=>"foo"}]', I18n.l(time, :format => :proc, :foo => 'foo', :locale => :ru)
           end
         end
 

test/api/tests/localization/time.rb

@@ -47,11 +47,6 @@ def setup
           assert_equal 'pm', I18n.l(@other_time, :format => '%p', :locale => :de)
         end
 
-        # TODO fails, but something along these lines probably should pass
-        # define_method "test localize Time: given a format that resolves to a Proc it calls the Proc with the object and extra options" do
-        #   assert_equal '[Sat Mar 01 06:00:00 UTC 2008, {:foo=>"foo"}]', I18n.l(@time, :format => :proc, :foo => 'foo', :locale => :de)
-        # end
-
         define_method "test localize Time: given an unknown format it does not fail" do
           assert_nothing_raised { I18n.l(@time, :format => '%x') }
         end