2003-05-29  Jim Meyering  <jim@meyering.net>

	* time/strftime.c (my_strftime) [!defined _NL_CURRENT
	&& HAVE_STRFTIME]: Use underlying_strftime for %r.
	Suggested by Daniel Yacob <locales@geez.org>.
This commit is contained in:
Ulrich Drepper 2003-06-13 02:54:37 +00:00
parent 9d1e8e8e7c
commit b54aa55d36
4 changed files with 28 additions and 4 deletions

View File

@ -1,3 +1,9 @@
2003-05-29 Jim Meyering <jim@meyering.net>
* time/strftime.c (my_strftime) [!defined _NL_CURRENT
&& HAVE_STRFTIME]: Use underlying_strftime for %r.
Suggested by Daniel Yacob <locales@geez.org>.
2003-06-12 Steven Munroe <sjmunroe@us.ibm.com>
* sysdeps/powerpc/powerpc64/dl-machine.h (RTLD_START): Replace

View File

@ -1,3 +1,13 @@
2003-05-31 Petter Reinholdtsen <pere@hungry.com>
* locales/fi_FI: Add URL to a reference documenting Finish in
Finland
* locales/fi_FI [LC_MONETARY]: Correct mon_thousands_sep from
period (U002E) to non-break space (U00A0).
suggestion from Eero Häkkinen.
[LC_NUMERIC]: Correct thousands_sep from period (U002E) to
non-break space (U00A0). Based on suggestion from Eero Häkkinen.
2003-06-11 Ulrich Drepper <drepper@redhat.com>
* locales/lo_LA: New file.

View File

@ -19,6 +19,10 @@ comment_char %
% Charset: ISO-8859-1
% Distribution and use is free, also
% for commercial purposes.
%
% Useful sources:
% Locale info for Finnish in Finland
% http://std.dkuug.dk/cultreg/registrations/narrative/fi_FI,_1.0
LC_IDENTIFICATION
title "Finnish locale for Finland"
@ -2121,7 +2125,7 @@ LC_MONETARY
int_curr_symbol "<U0045><U0055><U0052><U0020>"
currency_symbol "<U20AC>"
mon_decimal_point "<U002C>"
mon_thousands_sep "<U002E>"
mon_thousands_sep "<U00A0>"
mon_grouping 3;3
positive_sign ""
negative_sign "<U002D>"
@ -2139,7 +2143,7 @@ END LC_MONETARY
LC_NUMERIC
decimal_point "<U002C>"
thousands_sep "<U002E>"
thousands_sep "<U00A0>"
grouping 3;3
END LC_NUMERIC

View File

@ -1144,13 +1144,17 @@ my_strftime (s, maxsize, format, tp ut_argument LOCALE_PARAM)
goto subformat;
case L_('r'):
#ifdef _NL_CURRENT
#if !defined _NL_CURRENT && HAVE_STRFTIME
goto underlying_strftime;
#else
# ifdef _NL_CURRENT
if (*(subfmt = (const CHAR_T *) _NL_CURRENT (LC_TIME,
NLW(T_FMT_AMPM)))
== L_('\0'))
#endif
# endif
subfmt = L_("%I:%M:%S %p");
goto subformat;
#endif
case L_('S'):
if (modifier == L_('E'))