diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2002-06-30 21:45:51 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2002-06-30 21:45:51 +0000 |
| commit | 690df9e701eb885480e5ff902bd3a088c6bd92d6 (patch) | |
| tree | 182d3529399d22b40e979dfe592801159e64406f /locale | |
| parent | 7cccc6f932adf8ee60407476ef11c2b56b6e6708 (diff) | |
| download | glibc-690df9e701eb885480e5ff902bd3a088c6bd92d6.tar.gz | |
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')
| -rw-r--r-- | locale/iso-639.def | 1 | ||||
| -rw-r--r-- | locale/programs/ld-address.c | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/locale/iso-639.def b/locale/iso-639.def index 5bdbfbc601..b317d1351f 100644 --- a/locale/iso-639.def +++ b/locale/iso-639.def @@ -52,6 +52,7 @@ DEFINE_LANGUAGE_CODE ("German", de, deu, ger) DEFINE_LANGUAGE_CODE ("Gaelic (Scots)", gd, gla, gla) DEFINE_LANGUAGE_CODE ("Irish", ga, gle, gle) DEFINE_LANGUAGE_CODE ("Gallegan", gl, glg, glg) +DEFINE_LANGUAGE_CODE3 ("Ganda", lug, lug) DEFINE_LANGUAGE_CODE ("Manx", gv, glv, glv) DEFINE_LANGUAGE_CODE ("Greek, Modern ()", el, gre, ell) DEFINE_LANGUAGE_CODE ("Guarani", gn, grn, grn) 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")); |