about summary refs log tree commit diff
path: root/locale/programs
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-06-30 21:45:51 +0000
committerUlrich Drepper <drepper@redhat.com>2002-06-30 21:45:51 +0000
commit690df9e701eb885480e5ff902bd3a088c6bd92d6 (patch)
tree182d3529399d22b40e979dfe592801159e64406f /locale/programs
parent7cccc6f932adf8ee60407476ef11c2b56b6e6708 (diff)
downloadglibc-690df9e701eb885480e5ff902bd3a088c6bd92d6.tar.gz
glibc-690df9e701eb885480e5ff902bd3a088c6bd92d6.tar.xz
glibc-690df9e701eb885480e5ff902bd3a088c6bd92d6.zip
Update.
	* locale/iso-639.def: Add entry for Ganda.
	* locale/programs/ld-address.c (DEFINE_LANGUAGE_CODE3): New
	definition.
	(address_finish): Handle entries with two letter ISO 639 code.

	* iconvdata/Makefile: Recreate gconv-modules.cache file in target
	expected result.  Reported by Stephen L Moshier <steve@moshier.net>.
Diffstat (limited to 'locale/programs')
-rw-r--r--locale/programs/ld-address.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/locale/programs/ld-address.c b/locale/programs/ld-address.c
index 5c8efaa282..079aa0094d 100644
--- a/locale/programs/ld-address.c
+++ b/locale/programs/ld-address.c
@@ -56,6 +56,8 @@ static struct
 {
 #define DEFINE_LANGUAGE_CODE(Name, Ab, Term, Lib) \
   { #Ab, #Term, #Lib },
+#define DEFINE_LANGUAGE_CODE3(Name, Term, Lib) \
+  { "", #Term, #Lib },
 #include "iso-639.def"
 };
 
@@ -247,7 +249,8 @@ No definition for %s category found"), "LC_ADDRESS"));
 				    "LC_ADDRESS", address->lang_ab));
 	}
       else
-	if (strcmp (iso639[cnt].ab, address->lang_ab) != 0)
+	if (strcmp (iso639[cnt].ab, address->lang_ab) != 0
+	    && iso639[cnt].ab[0] != '\0')
 	  WITH_CUR_LOCALE (error (0, 0, _("\
 %s: `%s' value does not match `%s' value"),
 				  "LC_ADDRESS", "lang_ab", "lang_term"));