From d2afebcce46f40e9d96fc48e541aa5a6d8deac9b Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 16 Jul 2002 04:56:00 +0000 Subject: Update. 2002-07-15 Ulrich Drepper * intl/tst-gettext.sh: Pass -f option to msgfmt. * intl/tst-gettext.c: Correctly handle untranslated messages in positive tests. * po/de.po: Update from translation team. --- intl/tst-gettext.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'intl/tst-gettext.c') diff --git a/intl/tst-gettext.c b/intl/tst-gettext.c index e6cbf6f..55b8310 100644 --- a/intl/tst-gettext.c +++ b/intl/tst-gettext.c @@ -1,5 +1,5 @@ /* Test of the gettext functions. - Copyright (C) 2000 Free Software Foundation, Inc. + Copyright (C) 2000, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 2000. @@ -235,7 +235,9 @@ positive_gettext_test (void) { const char *found = gettext (msgs[cnt].msgid); - if (found == NULL || strcmp (found, msgs[cnt].msgstr) != 0) + if (found == NULL + || (msgs[cnt].msgstr[0] != '\0' + && strcmp (found, msgs[cnt].msgstr) != 0)) { /* Oops, shouldn't happen. */ printf ("\ @@ -281,7 +283,9 @@ positive_dgettext_test (const char *domain) { const char *found = dgettext (domain, msgs[cnt].msgid); - if (found == NULL || strcmp (found, msgs[cnt].msgstr) != 0) + if (found == NULL + || (msgs[cnt].msgstr[0] != '\0' + && strcmp (found, msgs[cnt].msgstr) != 0)) { /* Oops, shouldn't happen. */ printf ("\ @@ -305,7 +309,9 @@ positive_dcgettext_test (const char *domain, int category) { const char *found = dcgettext (domain, msgs[cnt].msgid, category); - if (found == NULL || strcmp (found, msgs[cnt].msgstr) != 0) + if (found == NULL + || (msgs[cnt].msgstr[0] != '\0' + && strcmp (found, msgs[cnt].msgstr) != 0)) { /* Oops, shouldn't happen. */ printf ("\ -- cgit v1.1