diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-11-15 23:56:34 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-11-15 23:56:34 +0000 |
| commit | 111bb972b2b34f424d22d35ae97a24b9407fca78 (patch) | |
| tree | 002ccfeb9b2b8449eb35fdaa15bea0821551ee39 /intl/tst-gettext2.c | |
| parent | 89554807fda029995f81010a829e674d20605bdb (diff) | |
Update.
2000-11-15 Ulrich Drepper <drepper@redhat.com>
* intl/Makefile: tst-gettext2.sh does not need a third parameter.
* intl/tst-gettext2.sh: Copy locale data. Adjust LOCPATH. Verify
output of program.
* intl/tst-gettext2.c: Set C locale if setting other locale
failed. Use gettext() not _().
* locale/setlocale.c: Increment _nl_msg_cat_cntr whenever we
successfully loaded a new locale.
2000-11-13 Andreas Jaeger <aj@suse.de>
* configure.in: Require gcc 2.95 or newer.
2000-11-15 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/paths.h: Adjust for FHS.
Patch by Arkadiusz Miskiewicz <misiek@pld.ORG.PL>.
2000-11-11 Jim Meyering <meyering@lucent.com>
* string/strndup.c (strndup): Cast return value to `char *'.
2000-11-15 Jim Meyering <meyering@ascend.com>
* sysdeps/generic/memchr.c: Remove some useless parentheses.
[HAVE_STDLIB_H || defined _LIBC]: Include <stdlib.h>.
[HAVE_BP_SYM_H || defined _LIBC]: Guard inclusion of bp-sym.h.
[! (HAVE_BP_SYM_H || defined _LIBC)] (BP_SYM): Define as no-op.
Also #undef __memchr.
Use `weak_alias' only if it's defined.
2000-11-10 H.J. Lu <hjl@gnu.org>
* Makefile.in (install): Set LANGUAGE=C LC_ALL=C.
Diffstat (limited to 'intl/tst-gettext2.c')
| -rw-r--r-- | intl/tst-gettext2.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/intl/tst-gettext2.c b/intl/tst-gettext2.c index 0cc4cad84a..1174e8b4cc 100644 --- a/intl/tst-gettext2.c +++ b/intl/tst-gettext2.c @@ -24,15 +24,17 @@ #include <stdlib.h> #include <stdio.h> -struct data_t { +struct data_t +{ const char *selection; const char *description; }; int data_cnt = 2; struct data_t strings[] = -{{"String1", N_("First string for testing.")}, - {"String2", N_("Another string for testing.")} +{ + { "String1", N_("First string for testing.") }, + { "String2", N_("Another string for testing.") } }; const int lang_cnt = 3; @@ -50,18 +52,20 @@ main (void) unsetenv ("LC_CTYPE"); unsetenv ("LANG"); unsetenv ("OUTPUT_CHARSET"); - + textdomain ("tstlang"); for (i = 0; i < lang_cnt; ++i) { int j; - setlocale (LC_ALL, lang[i]); + if (setlocale (LC_ALL, lang[i]) == NULL) + setlocale (LC_ALL, "C"); bindtextdomain ("tstlang", OBJPFX "domaindir"); for (j = 0; j < data_cnt; ++j) - printf ("%s - %s\n", strings[j].selection, _(strings[j].description)); + printf ("%s - %s\n", strings[j].selection, + gettext (strings[j].description)); } return 0; |