From e29a20a180dc2b21634496f4b6defb0c8f23e052 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 16 Oct 2006 12:14:10 +0000 Subject: [PATCH] Update comment about locale name syntax. --- gettext-runtime/intl/ChangeLog | 5 +++++ gettext-runtime/intl/langprefs.c | 4 ++-- gettext-runtime/intl/localename.c | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog index 4e6198821..8ed79f951 100644 --- a/gettext-runtime/intl/ChangeLog +++ b/gettext-runtime/intl/ChangeLog @@ -1,3 +1,8 @@ +2006-10-09 Bruno Haible + + * langprefs.c: Update comment about locale name syntax. + * localename.c: Likewise. + 2006-10-11 Paul Eggert Bruno Haible diff --git a/gettext-runtime/intl/langprefs.c b/gettext-runtime/intl/langprefs.c index 5436040f9..59c8def21 100644 --- a/gettext-runtime/intl/langprefs.c +++ b/gettext-runtime/intl/langprefs.c @@ -1,5 +1,5 @@ /* Determine the user's language preferences. - Copyright (C) 2004-2005 Free Software Foundation, Inc. + Copyright (C) 2004-2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published @@ -35,7 +35,7 @@ extern void _nl_locale_name_canonicalize (char *name); /* Determine the user's language preferences, as a colon separated list of locale names in XPG syntax - language[_territory[.codeset]][@modifier] + language[_territory][.codeset][@modifier] The result must not be freed; it is statically allocated. The LANGUAGE environment variable does not need to be considered; it is already taken into account by the caller. */ diff --git a/gettext-runtime/intl/localename.c b/gettext-runtime/intl/localename.c index 1b8b99a1a..a37097084 100644 --- a/gettext-runtime/intl/localename.c +++ b/gettext-runtime/intl/localename.c @@ -978,7 +978,7 @@ _nl_locale_name_canonicalize (char *name) #endif /* Determine the current locale's name, and canonicalize it into XPG syntax - language[_territory[.codeset]][@modifier] + language[_territory][.codeset][@modifier] The codeset part in the result is not reliable; the locale_charset() should be used for codeset information instead. The result must not be freed; it is statically allocated. */ -- 2.47.2