From 7535b2d92dcdbdc79a26baf28da1f7e2aa1889da Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Tue, 31 Oct 2000 17:44:49 +0000
Subject: Update.

	* locale/programs/locale.c (print_item): Fix one more problem with
	string lists.  Patch by Chen Xiangyang <chenxy@opencjk.org>.

	* locale/categories.def: Add number of arguments to ctype-map-names
	and ctype-class-names entries.  Mark era as stringlist.
---
 locale/categories.def | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'locale/categories.def')

diff --git a/locale/categories.def b/locale/categories.def
index c5ef6dc802..14b02dfb02 100644
--- a/locale/categories.def
+++ b/locale/categories.def
@@ -71,8 +71,8 @@ DEFINE_CATEGORY
   DEFINE_ELEMENT (_NL_CTYPE_TOUPPER,      "ctype-toupper",      std, wstring)
   DEFINE_ELEMENT (_NL_CTYPE_TOLOWER,      "ctype-tolower",      std, wstring)
   DEFINE_ELEMENT (_NL_CTYPE_CLASS32,      "ctype-class32",      std, wstring)
-  DEFINE_ELEMENT (_NL_CTYPE_CLASS_NAMES,  "ctype-class-names",  std, stringlist)
-  DEFINE_ELEMENT (_NL_CTYPE_MAP_NAMES,	  "ctype-map-names",    std, stringlist)
+  DEFINE_ELEMENT (_NL_CTYPE_CLASS_NAMES,  "ctype-class-names",  std, stringlist, 10, 32)
+  DEFINE_ELEMENT (_NL_CTYPE_MAP_NAMES,	  "ctype-map-names",    std, stringlist, 2, 32)
   DEFINE_ELEMENT (_NL_CTYPE_WIDTH,	  "ctype-width",        std, bytearray)
   DEFINE_ELEMENT (_NL_CTYPE_MB_CUR_MAX,	  "ctype-mb-cur-max",   std, word)
   DEFINE_ELEMENT (_NL_CTYPE_CODESET_NAME, "charmap",		std, string)
@@ -211,7 +211,7 @@ DEFINE_CATEGORY
   DEFINE_ELEMENT (D_FMT,       "d_fmt",       std, string)
   DEFINE_ELEMENT (T_FMT,       "t_fmt",       std, string)
   DEFINE_ELEMENT (T_FMT_AMPM,  "t_fmt_ampm",  std, string)
-  DEFINE_ELEMENT (ERA,         "era",         opt, stringarray)
+  DEFINE_ELEMENT (ERA,         "era",         opt, stringlist, 0, 100)
   DEFINE_ELEMENT (ERA_YEAR,    "era_year",    opt, string)
   DEFINE_ELEMENT (ERA_D_FMT,   "era_d_fmt",   opt, string)
   DEFINE_ELEMENT (ALT_DIGITS,  "alt_digits",  opt, stringlist,  100, 100)
-- 
cgit v1.2.1

