From b54aa55d36ab28db6d505bf34626a9ac4b639495 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 13 Jun 2003 02:54:37 +0000
Subject: [PATCH] Update.

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>.
---
 ChangeLog                |  6 ++++++
 localedata/ChangeLog     | 10 ++++++++++
 localedata/locales/fi_FI |  8 ++++++--
 time/strftime.c          |  8 ++++++--
 4 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9299402b97..d6f4740f6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 5be01164a3..767058e895 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -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.
diff --git a/localedata/locales/fi_FI b/localedata/locales/fi_FI
index 6a24d83c1b..13e3bf47f2 100644
--- a/localedata/locales/fi_FI
+++ b/localedata/locales/fi_FI
@@ -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
 
diff --git a/time/strftime.c b/time/strftime.c
index 99bf7f6f12..d83020563e 100644
--- a/time/strftime.c
+++ b/time/strftime.c
@@ -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'))