diff test/unit/lib/redmine/.svn/text-base/i18n_test.rb.svn-base @ 37:94944d00e43c

* Update to SVN trunk rev 4411
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Fri, 19 Nov 2010 13:24:41 +0000
parents 513646585e45
children af80e5618e9b 8661b858af72
line wrap: on
line diff
--- a/test/unit/lib/redmine/.svn/text-base/i18n_test.rb.svn-base	Fri Sep 24 14:06:04 2010 +0100
+++ b/test/unit/lib/redmine/.svn/text-base/i18n_test.rb.svn-base	Fri Nov 19 13:24:41 2010 +0000
@@ -29,7 +29,7 @@
     set_language_if_valid 'en'
     today = Date.today
     Setting.date_format = ''    
-    assert_equal I18n.l(today), format_date(today)
+    assert_equal I18n.l(today, :count => today.strftime('%d')), format_date(today)
   end
   
   def test_date_format
@@ -47,7 +47,7 @@
         format_date(Date.today)
         format_time(Time.now)
         format_time(Time.now, false)
-        assert_not_equal 'default', ::I18n.l(Date.today, :format => :default), "date.formats.default missing in #{lang}"
+        assert_not_equal 'default', ::I18n.l(Date.today, :count => Date.today.strftime('%d'), :format => :default), "date.formats.default missing in #{lang}"
         assert_not_equal 'time',    ::I18n.l(Time.now, :format => :time),      "time.formats.time missing in #{lang}"
       end
       assert l('date.day_names').is_a?(Array)
@@ -63,8 +63,8 @@
     now = Time.now
     Setting.date_format = ''
     Setting.time_format = ''    
-    assert_equal I18n.l(now), format_time(now)
-    assert_equal I18n.l(now, :format => :time), format_time(now, false)
+    assert_equal I18n.l(now, :count => now.strftime('%d')), format_time(now)
+    assert_equal I18n.l(now, :count => now.strftime('%d'), :format => :time), format_time(now, false)
   end
   
   def test_time_format