svn: /php/php-src/ branches/PHP_5_3/tests/lang/034.phpt branches/PHP_5_3/tests/lang/bug30638.phpt trunk/tests/lang/034.phpt
trunk/tests/lang/bug30638.phpt
| From: | Adam Harvey | Date: | Wed, 23 Mar 2011 08:59:11 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/tests/lang/034.phpt branches/PHP_5_3/tests/lang/bug30638.phpt trunk/tests/lang/034.phpt trunk/tests/lang/bug30638.phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-64746@lists.php.net to get a copy of this message | ||
aharvey Wed, 23 Mar 2011 08:59:11 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=309586
Log:
Implement request #54355 (Test for de_DE doesn't use UTF-8 locales). Patch by
Ondřej Surý.
Bug: http://bugs.php.net/54355 (Assigned) Test for de_DE
doesn't use UTF-8 locales
Changed paths:
U php/php-src/branches/PHP_5_3/tests/lang/034.phpt
U php/php-src/branches/PHP_5_3/tests/lang/bug30638.phpt
U php/php-src/trunk/tests/lang/034.phpt
U php/php-src/trunk/tests/lang/bug30638.phpt
Modified: php/php-src/branches/PHP_5_3/tests/lang/034.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/tests/lang/034.phpt 2011-03-23 08:57:52 UTC (rev 309585)
+++ php/php-src/branches/PHP_5_3/tests/lang/034.phpt 2011-03-23 08:59:11 UTC (rev 309586)
@@ -4,14 +4,14 @@
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";
?>
Modified: php/php-src/branches/PHP_5_3/tests/lang/bug30638.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/tests/lang/bug30638.phpt 2011-03-23 08:57:52 UTC (rev 309585)
+++ php/php-src/branches/PHP_5_3/tests/lang/bug30638.phpt 2011-03-23 08:59:11 UTC (rev 309586)
@@ -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 @@
--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']);
Modified: php/php-src/trunk/tests/lang/034.phpt
===================================================================
--- php/php-src/trunk/tests/lang/034.phpt 2011-03-23 08:57:52 UTC (rev 309585)
+++ php/php-src/trunk/tests/lang/034.phpt 2011-03-23 08:59:11 UTC (rev 309586)
@@ -4,14 +4,14 @@
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";
?>
Modified: php/php-src/trunk/tests/lang/bug30638.phpt
===================================================================
--- php/php-src/trunk/tests/lang/bug30638.phpt 2011-03-23 08:57:52 UTC (rev 309585)
+++ php/php-src/trunk/tests/lang/bug30638.phpt 2011-03-23 08:59:11 UTC (rev 309586)
@@ -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 @@
--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']);