Update.

2001-01-02  Ulrich Drepper  <drepper@redhat.com>

	* intl/dcigettext.c (guess_category_value): Rewrite so that LANGUAGE
	value is ignored if the selected locale is the C locale.
	* intl/tst-gettext.c: Set locale for above change.
	* intl/tst-translit.c: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 94934a1630eaadc9f4cb90203a6785cf23dd6448..d4c170939f4db082f5e374601230c682503e105a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-01-02  Ulrich Drepper  <drepper@redhat.com>
+
+       * intl/dcigettext.c (guess_category_value): Rewrite so that LANGUAGE
+       value is ignored if the selected locale is the C locale.
+       * intl/tst-gettext.c: Set locale for above change.
+       * intl/tst-translit.c: Likewise.
+
 2001-01-02  Andreas Jaeger  <aj@suse.de>
 
        * libio/wgenops.c (_IO_wdoallocbuf): Use correct wide access macro.

diff --git a/intl/tst-gettext.c b/intl/tst-gettext.c
index a83b1d25bd087f281eea3571625ed6b85bf495fc..1f5e6f19185278fd503774e3623b677f5d6f0434 100644 (file)
--- a/intl/tst-gettext.c
+++ b/intl/tst-gettext.c
@@ -76,6 +76,7 @@ main (int argc, char *argv[])
   setenv ("LC_CTYPE", "non-existing-locale", 1);
   setenv ("LANG", "non-existing-locale", 1);
   setlocale (LC_CTYPE, "de_DE.ISO-8859-1");
+  setlocale (LC_MESSAGES, "de_DE.ISO-8859-1");
   unsetenv ("OUTPUT_CHARSET");
   /* This is the name of the existing domain with a catalog for the
      LC_MESSAGES category.  */

diff --git a/intl/tst-translit.c b/intl/tst-translit.c
index 5d42ae3371a4edaa68305320a870ad14455afa41..3fa8d4cdd327e2bdc39451f1da15ab4ed96f61e7 100644 (file)
--- a/intl/tst-translit.c
+++ b/intl/tst-translit.c
@@ -18,6 +18,7 @@
    Boston, MA 02111-1307, USA.  */
 
 #include <libintl.h>
+#include <locale.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -31,6 +32,7 @@ main (void)
 
   setenv ("LANGUAGE", "existing-locale", 1);
   unsetenv ("OUTPUT_CHARSET");
+  setlocale (LC_ALL, "en_US.ANSI_X3.4-1968");
   textdomain ("translit");
   bindtextdomain ("translit", OBJPFX "domaindir");