diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-07-07 01:36:24 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-07-07 01:36:24 -0700 |
| commit | 432bb7abe5effd0978b7c7e09e46630c1a6826d3 (patch) | |
| tree | 0c8d13eb5f3f86aa6047a443c1391010e84a4331 /ext | |
| parent | 04a227dd1610355ce2a86a3bad718c86eed1e6fa (diff) | |
| parent | c4029561782234abb0b8b463f546f794ad03f1cc (diff) | |
| download | php-git-432bb7abe5effd0978b7c7e09e46630c1a6826d3.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
change locale - looks like not everybody has sl_SI
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/intl/tests/bug67052.phpt | 4 |
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 |