diff options
| author | Adam Harvey <aharvey@php.net> | 2011-03-23 08:59:11 +0000 |
|---|---|---|
| committer | Adam Harvey <aharvey@php.net> | 2011-03-23 08:59:11 +0000 |
| commit | 13a91f86b738de9aaeb4a03ca1dd5b1c6dc69c88 (patch) | |
| tree | ea4a0d3a314edb3372216f26c110ea32a67edbb8 | |
| parent | 8307f9e89258ed0e5946ca64e5d856b5bef088ac (diff) | |
| download | php-git-13a91f86b738de9aaeb4a03ca1dd5b1c6dc69c88.tar.gz | |
Implement request #54355 (Test for de_DE doesn't use UTF-8 locales). Patch by
Ondřej Surý.
| -rw-r--r-- | tests/lang/034.phpt | 4 | ||||
| -rw-r--r-- | tests/lang/bug30638.phpt | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/lang/034.phpt b/tests/lang/034.phpt index e442db8ff1..dcb5436e2f 100644 --- a/tests/lang/034.phpt +++ b/tests/lang/034.phpt @@ -4,14 +4,14 @@ Bug #12647 (Locale settings affecting float parsing) precision=14 --SKIPIF-- <?php # try to activate a german locale -if (setlocale(LC_NUMERIC, "de_DE", "de", "german", "ge", "de_DE.ISO8859-1") === FALSE) { +if (setlocale(LC_NUMERIC, "de_DE.UTF-8", "de_DE", "de", "german", "ge", "de_DE.ISO-8859-1") === FALSE) { print "skip"; } ?> --FILE-- <?php # activate the german locale -setlocale(LC_NUMERIC, "de_DE", "de", "german", "ge", "de_DE.ISO8859-1"); +setlocale(LC_NUMERIC, "de_DE.UTF-8", "de_DE", "de", "german", "ge", "de_DE.ISO-8859-1"); echo (float)"3.14", "\n"; ?> diff --git a/tests/lang/bug30638.phpt b/tests/lang/bug30638.phpt index 101ce934eb..30b70f30fb 100644 --- a/tests/lang/bug30638.phpt +++ b/tests/lang/bug30638.phpt @@ -2,7 +2,7 @@ Bug #30638 (localeconv returns wrong LC_NUMERIC settings) (ok to fail on MacOS X) --SKIPIF-- <?php # try to activate a german locale -if (setlocale(LC_NUMERIC, "de_DE", "de", "german", "ge") === FALSE) { +if (setlocale(LC_NUMERIC, "de_DE.UTF-8", "de_DE", "de", "german", "ge", "de_DE.ISO-8859-1") === FALSE) { print "skip setlocale() failed"; } elseif (strtolower(php_uname('s')) == 'darwin') { print "skip ok to fail on MacOS X"; @@ -11,7 +11,7 @@ if (setlocale(LC_NUMERIC, "de_DE", "de", "german", "ge") === FALSE) { --FILE-- <?php # activate the german locale -setlocale(LC_NUMERIC, "de_DE", "de", "german", "ge"); +setlocale(LC_NUMERIC, "de_DE.UTF-8", "de_DE", "de", "german", "ge", "de_DE.ISO-8859-1"); $lc = localeconv(); printf("decimal_point: %s\n", $lc['decimal_point']); |