Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  change locale - looks like not everybody has sl_SI
This commit is contained in:
Stanislav Malyshev 2014-07-07 01:36:03 -07:00
commit c402956178

View file

@ -7,7 +7,7 @@ Bug #67052 - NumberFormatter::parse() resets LC_NUMERIC setting
function ut_main() function ut_main()
{ {
setlocale(LC_ALL, 'sl_SI.UTF-8'); setlocale(LC_ALL, 'de_DE');
$fmt = new NumberFormatter( 'sl_SI.UTF-8', NumberFormatter::DECIMAL); $fmt = new NumberFormatter( 'sl_SI.UTF-8', NumberFormatter::DECIMAL);
$num = "1.234.567,891"; $num = "1.234.567,891";
@ -22,4 +22,4 @@ ut_run();
?> ?>
--EXPECT-- --EXPECT--
1234567,891 1234567,891
sl_SI.UTF-8 de_DE