diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2001-01-03 04:02:46 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2001-01-03 04:02:46 +0000 |
| commit | 3470b82679c30642a7a9e3b9e59cd12afb957761 (patch) | |
| tree | e3eeca778e98ebddc25104d7e448d992325c7c98 | |
| parent | 3859d27d73f37877d0633092ab003e0bf2753b13 (diff) | |
| download | glibc-3470b82679c30642a7a9e3b9e59cd12afb957761.tar.gz glibc-3470b82679c30642a7a9e3b9e59cd12afb957761.tar.xz glibc-3470b82679c30642a7a9e3b9e59cd12afb957761.zip | |
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.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | intl/tst-gettext.c | 1 | ||||
| -rw-r--r-- | intl/tst-translit.c | 2 |
3 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 94934a1630..d4c170939f 100644 --- 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 a83b1d25bd..1f5e6f1918 100644 --- 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 5d42ae3371..3fa8d4cdd3 100644 --- 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"); |