From: Ulrich Drepper <drepper@redhat.com>
Date: Sun, 15 Aug 2004 19:28:54 +0000 (+0000)
Subject: Update.
X-Git-Tag: upstream/2.30~17659
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1e6d2101ea891d63c11e8ad096f049fbb7e35242;p=external%2Fglibc.git

Update.

	* intl/tst-gettext.sh: Adjust for change for de.po file to UTF-8.
	* intl/tst-gettext.c: Likewise.
---

diff --git a/ChangeLog b/ChangeLog
index 2ef7854..9bf99bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-08-15  Ulrich Drepper  <drepper@redhat.com>
 
+	* intl/tst-gettext.sh: Adjust for change for de.po file to UTF-8.
+	* intl/tst-gettext.c: Likewise.
+
 	* nss/getent.c (ahosts_keys_int): Correctly print IPv6 addresses.
 
 	* nss/getent.c: Allow queries for getaddrinfo with AF_INET and
diff --git a/intl/tst-gettext.c b/intl/tst-gettext.c
index 09b0e79..a8406c2 100644
--- a/intl/tst-gettext.c
+++ b/intl/tst-gettext.c
@@ -87,8 +87,8 @@ main (int argc, char *argv[])
   setenv ("LC_MESSAGES", "non-existing-locale", 1);
   setenv ("LC_CTYPE", "non-existing-locale", 1);
   setenv ("LANG", "non-existing-locale", 1);
-  check_setlocale (LC_CTYPE, "de_DE.ISO-8859-1");
-  check_setlocale (LC_MESSAGES, "de_DE.ISO-8859-1");
+  check_setlocale (LC_CTYPE, "de_DE.UTF-8");
+  check_setlocale (LC_MESSAGES, "de_DE.UTF-8");
   unsetenv ("OUTPUT_CHARSET");
   /* This is the name of the existing domain with a catalog for the
      LC_MESSAGES category.  */
diff --git a/intl/tst-gettext.sh b/intl/tst-gettext.sh
index cf6f6f3..9d4375b 100755
--- a/intl/tst-gettext.sh
+++ b/intl/tst-gettext.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Test of gettext functions.
-# Copyright (C) 2000, 2002 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2002, 2004 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 #
 
@@ -31,10 +31,10 @@ export LC_ALL
 # Create the locale directories.
 mkdir -p ${objpfx}localedir/existing-locale/LC_MESSAGES
 for f in ADDRESS COLLATE CTYPE IDENTIFICATION MEASUREMENT MONETARY NAME NUMERIC PAPER TELEPHONE TIME; do
-  cp -f ${common_objpfx}localedata/de_DE.ISO-8859-1/LC_$f \
+  cp -f ${common_objpfx}localedata/de_DE.UTF-8/LC_$f \
         ${objpfx}localedir/existing-locale
 done
-cp -f ${common_objpfx}localedata/de_DE.ISO-8859-1/LC_MESSAGES/SYS_LC_MESSAGES \
+cp -f ${common_objpfx}localedata/de_DE.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES \
       ${objpfx}localedir/existing-locale/LC_MESSAGES
 
 # Create the domain directories.