Ticket #3488: patch_for_3488.patch
| File patch_for_3488.patch, 2.1 kB (added by FabianLange, 8 months ago) |
|---|
-
lib/i18n/sfCultureInfo.class.php
old new 360 360 { 361 361 if ($merge) 362 362 { 363 $result = array_merge($info, $result);363 $result = sfToolkit::arrayDeepMerge($info, $result); 364 364 } 365 365 else 366 366 { -
test/unit/i18n/sfCultureInfoTest.php
old new 10 10 11 11 require_once(dirname(__FILE__).'/../../bootstrap/unit.php'); 12 12 13 $t = new lime_test(5 6, new lime_output_color());13 $t = new lime_test(57, new lime_output_color()); 14 14 15 15 // __construct() 16 16 $t->diag('__construct()'); … … 75 75 $t->diag('->getTimeZones()'); 76 76 $time_zones_en = $c_en->getTimeZones(); 77 77 $time_zones_fr = $c_fr->getTimeZones(); 78 $t->is($time_zones_ en[1][0], 'America/Los_Angeles', '->getTimeZones() returns a list of time zones in the language of the localized version');79 $t->is($time_zones_ fr[1][0], 'America/Vancouver', '->getTimeZones() returns a list of time zones in the language of the localized version');78 $t->is($time_zones_fr[1][0], 'America/Los_Angeles', '->getTimeZones() returns a list of time zones in the language of the localized version'); 79 $t->is($time_zones_en[1][0], 'America/Vancouver', '->getTimeZones() returns a list of time zones in the language of the localized version'); 80 80 $t->is($time_zones_en, $c_en->TimeZones, '->getTimeZones() is equivalent to ->TimeZones'); 81 81 82 82 // ->validCulture() … … 176 176 $c->DateTimeFormat = 'mm'; 177 177 $t->is($c->getDateTimeFormat(), 'mm', '->setDateTimeFormat() is equivalent to ->DateTimeFormat = '); 178 178 179 // regression test for http://trac.symfony-project.com/ticket/3488 180 $c = new sfCultureInfo('zh_HK'); 181 $t->is(count($c->getDateTimeFormat()->getMonthNames()), 12, '->getMonthNames returns 12 month names for zh_HK locale (see #3488).'); 182 179 183 // ->getNumberFormat() 180 184 $t->diag('->getNumberFormat()'); 181 185 $c = new sfCultureInfo();
