summary refs log tree commit diff
path: root/intl
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-07-16 04:56:00 +0000
committerUlrich Drepper <drepper@redhat.com>2002-07-16 04:56:00 +0000
commitd2afebcce46f40e9d96fc48e541aa5a6d8deac9b (patch)
treea6cd43082f0317ad70fd5598d55d6146e0cddbe5 /intl
parenta99bfa85d82aecc3eb780779377a9e178e7189d2 (diff)
downloadglibc-d2afebcce46f40e9d96fc48e541aa5a6d8deac9b.tar.gz
glibc-d2afebcce46f40e9d96fc48e541aa5a6d8deac9b.tar.xz
glibc-d2afebcce46f40e9d96fc48e541aa5a6d8deac9b.zip
Update.
2002-07-15  Ulrich Drepper  <drepper@redhat.com>

	* 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.
Diffstat (limited to 'intl')
-rw-r--r--intl/tst-gettext.c14
-rwxr-xr-xintl/tst-gettext.sh4
2 files changed, 12 insertions, 6 deletions
diff --git a/intl/tst-gettext.c b/intl/tst-gettext.c
index e6cbf6f1b2..55b8310dfa 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 <drepper@cygnus.com>, 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 ("\
diff --git a/intl/tst-gettext.sh b/intl/tst-gettext.sh
index 3c7ccc392e..91abd38d95 100755
--- a/intl/tst-gettext.sh
+++ b/intl/tst-gettext.sh
@@ -49,9 +49,9 @@ test -d ${objpfx}localedir/existing-locale/LC_MESSAGES || {
 
 # Populate them.
 msgfmt -o ${objpfx}domaindir/existing-locale/LC_MESSAGES/existing-domain.mo \
-       ../po/de.po
+       -f ../po/de.po
 msgfmt -o ${objpfx}domaindir/existing-locale/LC_TIME/existing-time-domain.mo \
-       ../po/de.po
+       -f ../po/de.po
 
 GCONV_PATH=${common_objpfx}iconvdata
 export GCONV_PATH