summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2014-07-07 01:38:04 -0700
committerStanislav Malyshev <stas@php.net>2014-07-07 01:38:04 -0700
commitf0499b86a8b83204eab14e25eb7cb15536f9e69f (patch)
tree193781d6d9b50c233d7512cfb0059cb99c557c0b
parent70c0410d3db15d5a274be14f561d3f05b44459b8 (diff)
parent432bb7abe5effd0978b7c7e09e46630c1a6826d3 (diff)
downloadphp-git-f0499b86a8b83204eab14e25eb7cb15536f9e69f.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: change locale - looks like not everybody has sl_SI
-rw-r--r--ext/intl/tests/bug67052.phpt4
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/intl/tests/bug67052.phpt b/ext/intl/tests/bug67052.phpt
index 59579395dd..f3245f8398 100644
--- a/ext/intl/tests/bug67052.phpt
+++ b/ext/intl/tests/bug67052.phpt
@@ -7,7 +7,7 @@ Bug #67052 - NumberFormatter::parse() resets LC_NUMERIC setting
function ut_main()
{
- setlocale(LC_ALL, 'sl_SI.UTF-8');
+ setlocale(LC_ALL, 'de_DE');
$fmt = new NumberFormatter( 'sl_SI.UTF-8', NumberFormatter::DECIMAL);
$num = "1.234.567,891";
@@ -22,4 +22,4 @@ ut_run();
?>
--EXPECT--
1234567,891
-sl_SI.UTF-8
+de_DE