* tests/lang-default (LC_ALL): Set to "C", so we get

English-language diagnostics.  Unset the other variables.

diff --git a/ChangeLog b/ChangeLog
index 5a31ecb..84ea7d8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2006-08-16  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * tests/lang-default (LC_ALL): Set to "C", so we get
+       English-language diagnostics.  Unset the other variables; it
+       should be portable to use 'unset' for this stuff nowadays.
+       Problem reported by Bruno Haible.  Using "C" reverses the
+       2000-10-22 change to fileutils in this area.
+
        Fix bugs when printing plurals of numbers that are not
        unsigned long int values.
        * src/system.h (select_plural): New function.

diff --git a/tests/lang-default b/tests/lang-default
index a6a9cdc..882672f 100644 (file)
--- a/tests/lang-default
+++ b/tests/lang-default
@@ -2,7 +2,9 @@
 # Set locale-related environment variables so we get consistent
 # message translations, time formats, sort orderings, etc.
 
-for i in \
-    LANG LANGUAGE LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_NUMERIC LC_TIME; do
-  eval "$i=; export $i"
-done
+LC_ALL=C
+export LC_ALL
+unset LANGUAGE NLSPATH
+
+# These settings shouldn't matter, but unset them anyway just in case.
+unset LANG LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME