Updated to fedora-glibc-20080703T1203cvs/fedora-glibc-2_8_90-8

5 files changed, 286 insertions, 5 deletions

diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index b446ad4361..a7291beec9 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,23 @@
+2008-06-27  Ulrich Drepper  <drepper@redhat.com>
+
+	* tst-strptime.c (do_test): Add test of %EY.
+
+2008-06-25  Ulrich Drepper  <drepper@redhat.com>
+
+	* tst-strptime.c (do_test): Add test for parsing era year
+	representation.
+
+	[BZ #5911]
+	* locales/es_CR: Define first_weekday and first_workday.
+
+	[BZ #5814]
+	* locales/fi_FI: Fix separator for hours, minutes, and seconds.
+
+2008-06-24  Ulrich Drepper  <drepper@redhat.com>
+
+	* locales/iso14651_t1_common: Add support for Gurumukhi script.
+	Patch by Pravin Satpute <psatpute@redhat.com>.
+
 2008-05-21  Ulrich Drepper  <drepper@redhat.com>
 
 	* locales/iso14651_t1_common: Remove U0C0D entry added for Telugu.
diff --git a/localedata/locales/es_CR b/localedata/locales/es_CR
index 753b22b055..d582a20d9b 100644
--- a/localedata/locales/es_CR
+++ b/localedata/locales/es_CR
@@ -113,6 +113,8 @@ t_fmt_ampm "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U002
 date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
 <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
 <U0025><U005A><U0020><U0025><U0059>"
+first_weekday 1
+first_workday 2
 END LC_TIME
 
 LC_PAPER
diff --git a/localedata/locales/fi_FI b/localedata/locales/fi_FI
index 9ffe8f103e..a7920acb13 100644
--- a/localedata/locales/fi_FI
+++ b/localedata/locales/fi_FI
@@ -193,13 +193,15 @@ mon      "<U0074><U0061><U006D><U006D><U0069><U006B><U0075><U0075>";/
          "<U006D><U0061><U0072><U0072><U0061><U0073><U006B><U0075><U0075>";/
          "<U006A><U006F><U0075><U006C><U0075><U006B><U0075><U0075>"
 d_t_fmt  "<U0025><U0061><U0020><U0025><U0065><U002E><U0020><U0025><U0042>/
-<U0074><U0061><U0020><U0025><U0059><U0020><U0025><U0054>"
+<U0074><U0061><U0020><U0025><U0059><U0020><U0025><U0048><U002E><U0025>/
+<U004D><U002E><U0025><U0053>"
 d_fmt    "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0059>"
-t_fmt    "<U0025><U0054>"
+t_fmt    "<U0025><U0048><U002E><U0025><U004D><U002E><U0025><U0053>"
 am_pm    "";""
 t_fmt_ampm  ""
 date_fmt       "<U0025><U0061><U0020><U0025><U002D><U0064><U002E><U0025>/
-<U002D><U006D><U002E><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U007A>"
+<U002D><U006D><U002E><U0025><U0059><U0020><U0025><U0048><U002E><U0025>/
+<U004D><U002E><U0025><U0053><U0020><U0025><U007A>"
 first_weekday 2 % Monday
 first_workday 2 % Monday
 END LC_TIME
diff --git a/localedata/locales/iso14651_t1_common b/localedata/locales/iso14651_t1_common
index fcbd897f0e..35c0af0b21 100644
--- a/localedata/locales/iso14651_t1_common
+++ b/localedata/locales/iso14651_t1_common
@@ -63,6 +63,7 @@ script <GEORGIAN>
 script <DEVANAGARI>
 script <GUJARATI>
 script <TELUGU>
+script <GURUMUKHI>
 
 # Déclaration des symboles internes / Declaration of internal symbols
 #
@@ -742,6 +743,79 @@ collating-symbol <t-halant>
 collating-symbol <t-lenghtmark>
 collating-symbol <t-ailenghtmark>
 
+#<GURUMUKHI>
+#
+# pm - denotes panjabi matras
+# pvw - panjabi denotes vowels
+# pavd - denotes panjabi vowel modifier
+# PNKT - Punjabi Nukta
+
+# defning symbols
+collating-symbol <PNKT>
+collating-symbol <adi-shakti>
+collating-symbol <onkar>
+collating-symbol <ura>
+collating-symbol <pavw-u>
+collating-symbol <pavw-uu>
+collating-symbol <pavw-o>
+collating-symbol <pavw-a>
+collating-symbol <pavw-aa>
+collating-symbol <pavw-ai>
+collating-symbol <pavw-au>
+collating-symbol <iri>
+collating-symbol <pavw-i>
+collating-symbol <pavw-ii>
+collating-symbol <pavw-e>
+collating-symbol <pa-sa>
+collating-symbol <pa-ha>
+collating-symbol <pa-udatta>
+collating-symbol <pa-ka>
+collating-symbol <pa-kha>
+collating-symbol <pa-ga>
+collating-symbol <pa-gha>
+collating-symbol <pa-nga>
+collating-symbol <pa-ca>
+collating-symbol <pa-cha>
+collating-symbol <pa-ja>
+collating-symbol <pa-jha>
+collating-symbol <pa-nya>
+collating-symbol <pa-tta>
+collating-symbol <pa-ttha>
+collating-symbol <pa-dda>
+collating-symbol <pa-ddha>
+collating-symbol <pa-nna>
+collating-symbol <pa-ta>
+collating-symbol <pa-tha>
+collating-symbol <pa-da>
+collating-symbol <pa-dha>
+collating-symbol <pa-na>
+collating-symbol <pa-pa>
+collating-symbol <pa-pha>
+collating-symbol <pa-ba>
+collating-symbol <pa-bha>
+collating-symbol <pa-ma>
+collating-symbol <pa-ya>
+collating-symbol <sign-yakash>
+collating-symbol <pa-ra>
+collating-symbol <pa-la>
+collating-symbol <pa-va>
+collating-symbol <pa-rra>
+collating-symbol <pam-aa>
+collating-symbol <pam-i>
+collating-symbol <pam-ii>
+collating-symbol <pam-u>
+collating-symbol <pam-uu>
+collating-symbol <pam-e>
+collating-symbol <pam-ai>
+collating-symbol <pam-o>
+collating-symbol <pam-au>
+collating-symbol <pavd-adakbindi>
+collating-symbol <pavd-bindi>
+collating-symbol <pavd-visarg>
+collating-symbol <tippi>
+collating-symbol <adak>
+collating-symbol <pa-halant>
+
 # Ordre des symboles internes / Order of internal symbols
 #
 # SYMB. N°
@@ -1413,6 +1487,76 @@ collating-symbol <t-ailenghtmark>
 <t-lenghtmark>
 <t-ailenghtmark>
 
+#
+# <GURUMUKHI>
+#
+# collation weights in order
+
+<PNKT>
+<adak>
+<adi-shakti>
+<onkar>
+<ura>
+<pavw-u>
+<pavw-uu>
+<pavw-o>
+<pavw-a>
+<pavw-aa>
+<pavw-ai>
+<pavw-au>
+<iri>
+<pavw-i>
+<pavw-ii>
+<pavw-e>
+<pa-sa>
+<pa-ha>
+<pa-udatta>
+<pa-ka>
+<pa-kha>
+<pa-ga>
+<pa-gha>
+<pa-nga>
+<pa-ca>
+<pa-cha>
+<pa-ja>
+<pa-jha>
+<pa-nya>
+<pa-tta>
+<pa-ttha>
+<pa-dda>
+<pa-ddha>
+<pa-nna>
+<pa-ta>
+<pa-tha>
+<pa-da>
+<pa-dha>
+<pa-na>
+<pa-pa>
+<pa-pha>
+<pa-ba>
+<pa-bha>
+<pa-ma>
+<pa-ya>
+<sign-yakash>
+<pa-ra>
+<pa-la>
+<pa-va>
+<pa-rra>
+<pam-aa>
+<pam-i>
+<pam-ii>
+<pam-u>
+<pam-uu>
+<pam-e>
+<pam-ai>
+<pam-o>
+<pam-au>
+<pavd-adakbindi>
+<pavd-bindi>
+<pavd-visarg>
+<tippi>
+<pa-halant>
+
 order_start <SPECIAL>;forward;backward;forward;forward,position
 #
 # Tout caractère non précisément défini sera considéré comme caractère spécial
@@ -3472,6 +3616,88 @@ order_start <TELUGU>;forward;forward;forward;forward,position
 <U0C55> <t-lenghtmark>;<BAS>;<MIN>;IGNORE
 <U0C56> <t-ailenghtmark>;<BAS>;<MIN>;IGNORE
 
+order_start  <GURUMUKHI>;forward;forward;forward;forward,position
+<U0A66> <0>;"<BAS><NUM>";"<MIN><MIN>";IGNORE
+<U0A67> <1>;"<BAS><NUM>";"<MIN><MIN>";IGNORE
+<U0A68> <2>;"<BAS><NUM>";"<MIN><MIN>";IGNORE
+<U0A69> <3>;"<BAS><NUM>";"<MIN><MIN>";IGNORE
+<U0A6A> <4>;"<BAS><NUM>";"<MIN><MIN>";IGNORE
+<U0A6B> <5>;"<BAS><NUM>";"<MIN><MIN>";IGNORE
+<U0A6C> <6>;"<BAS><NUM>";"<MIN><MIN>";IGNORE
+<U0A6D> <7>;"<BAS><NUM>";"<MIN><MIN>";IGNORE
+<U0A6E> <8>;"<BAS><NUM>";"<MIN><MIN>";IGNORE
+<U0A6F> <9>;"<BAS><NUM>";"<MIN><MIN>";IGNORE
+<U262c> <adi-shakti>;<BAS>;<MIN>;IGNORE
+<U0A74> <onkar>;<BAS>;<MIN>;IGNORE
+<U0A73> <ura>;<BAS>;<MIN>;IGNORE
+<U0A09> <pavw-u> ;<BAS>;<MIN>;IGNORE
+<U0A0A> <pavw-uu>;<BAS>;<MIN>;IGNORE
+<U0A13> <pavw-o>;<BAS>;<MIN>;IGNORE
+<U0A05> <pavw-a> ;<BAS>;<MIN>;IGNORE
+<U0A06> <pavw-aa> ;<BAS>;<MIN>;IGNORE
+<U0A10> <pavw-ai>;<BAS>;<MIN>;IGNORE
+<U0A14> <pavw-au>;<BAS>;<MIN>;IGNORE
+<U0A72> <iri>;<BAS>;<MIN>;IGNORE
+<U0A07> <pavw-i> ;<BAS>;<MIN>;IGNORE
+<U0A08> <pavw-ii> ;<BAS>;<MIN>;IGNORE
+<U0A0F> <pavw-e>;<BAS>;<MIN>;IGNORE
+<U0A38> <pa-sa>;<BAS>;<MIN>;IGNORE
+<U0A36> <pa-sa>;"<BAS><PNKT>";"<MIN><MIN>";IGNORE
+<U0A39>   <pa-ha>;<BAS>;<MIN>;IGNORE
+<U0A51> <pa-udatta>;<BAS>;<MIN>;IGNORE
+<U0A15> <pa-ka>;<BAS>;<MIN>;IGNORE
+<U0A16> <pa-kha>;<BAS>;<MIN>;IGNORE
+<U0A59> <pa-kha>;"<BAS><PNKT>";"<MIN><MIN>";IGNORE
+<U0A17> <pa-ga>;<BAS>;<MIN>;IGNORE
+<U0A5A> <pa-ga>;"<BAS><PNKT>";"<MIN><MIN>";IGNORE
+<U0A18> <pa-gha>;<BAS>;<MIN>;IGNORE
+<U0A19> <pa-nga>;<BAS>;<MIN>;IGNORE
+<U0A1A> <pa-ca>;<BAS>;<MIN>;IGNORE
+<U0A1B> <pa-cha>;<BAS>;<MIN>;IGNORE
+<U0A1C> <pa-ja>;<BAS>;<MIN>;IGNORE
+<U0A5B> <pa-ja>;"<BAS><PNKT>";"<MIN><MIN>";IGNORE
+<U0A1D> <pa-jha>;<BAS>;<MIN>;IGNORE
+<U0A1E> <pa-nya>;<BAS>;<MIN>;IGNORE
+<U0A1F> <pa-tta>;<BAS>;<MIN>;IGNORE
+<U0A20> <pa-ttha>;<BAS>;<MIN>;IGNORE
+<U0A21> <pa-dda>;<BAS>;<MIN>;IGNORE
+<U0A22> <pa-ddha>;<BAS>;<MIN>;IGNORE
+<U0A23> <pa-nna>;<BAS>;<MIN>;IGNORE
+<U0A24> <pa-ta>;<BAS>;<MIN>;IGNORE
+<U0A25> <pa-tha>;<BAS>;<MIN>;IGNORE
+<U0A26> <pa-da>;<BAS>;<MIN>;IGNORE
+<U0A27> <pa-dha>;<BAS>;<MIN>;IGNORE
+<U0A28> <pa-na>;<BAS>;<MIN>;IGNORE
+<U0A2A> <pa-pa>;<BAS>;<MIN>;IGNORE
+<U0A2B> <pa-pha>;<BAS>;<MIN>;IGNORE
+<U0A5E> <pa-pha>;"<BAS><PNKT>";"<MIN><MIN>";IGNORE
+<U0A2C> <pa-ba>;<BAS>;<MIN>;IGNORE
+<U0A2D> <pa-bha>;<BAS>;<MIN>;IGNORE
+<U0A2E> <pa-ma>;<BAS>;<MIN>;IGNORE
+<U0A2F> <pa-ya>;<BAS>;<MIN>;IGNORE
+<U0A75> <sign-yakash>;<BAS>;<MIN>;IGNORE
+<U0A30> <pa-ra>;<BAS>;<MIN>;IGNORE
+<U0A32> <pa-la>;<BAS>;<MIN>;IGNORE
+<U0A33> <pa-la>;"<BAS><PNKT>";"<MIN><MIN>";IGNORE
+<U0A35> <pa-va>;<BAS>;<MIN>;IGNORE
+<U0A5C> <pa-rra>;<BAS>;<MIN>;IGNORE
+<U0A3E> <pam-aa>;<BAS>;<MIN>;IGNORE
+<U0A3F> <pam-i>;<BAS>;<MIN>;IGNORE
+<U0A40> <pam-ii>;<BAS>;<MIN>;IGNORE
+<U0A41> <pam-u>;<BAS>;<MIN>;IGNORE
+<U0A42> <pam-uu>;<BAS>;<MIN>;IGNORE
+<U0A47> <pam-e>;<BAS>;<MIN>;IGNORE
+<U0A48> <pam-ai>;<BAS>;<MIN>;IGNORE
+<U0A4B> <pam-o>;<BAS>;<MIN>;IGNORE
+<U0A4C> <pam-au>;<BAS>;<MIN>;IGNORE
+<U0A01> <pavd-adakbindi>;<BAS>;<MIN>;IGNORE
+<U0A02> <pavd-bindi>;<BAS>;<MIN>;IGNORE
+<U0A03> <pavd-visarg>;<BAS>;<MIN>;IGNORE
+<U0A70> <tippi>;<BAS>;<MIN>;IGNORE
+<U0A4D> <pa-halant>;<BAS>;<MIN>;IGNORE
+<U0A3C> IGNORE;<PNKT>;<MIN>;IGNORE
+<U0A71> IGNORE;<adak>;<MIN>;IGNORE
+
 order_end
 
 END LC_COLLATE
diff --git a/localedata/tst-strptime.c b/localedata/tst-strptime.c
index b5ab232d7e..bc2c7f1b64 100644
--- a/localedata/tst-strptime.c
+++ b/localedata/tst-strptime.c
@@ -1,22 +1,53 @@
 #include <locale.h>
 #include <time.h>
 #include <stdio.h>
+#include <string.h>
 
 static int
 do_test (void)
 {
+  int result = 0;
+
   if (setlocale (LC_ALL, "vi_VN.TCVN5712-1") == NULL)
     {
       puts ("cannot set locale");
       return 1;
     }
   struct tm tm;
+  memset (&tm, '\0', sizeof (tm));
   /* This is November in Vietnamese encoded using TCVN5712-1.  */
   static const char s[] = "\
-\x54\x68\xb8\x6e\x67\x20\x6d\xad\xea\x69\x20\x6d\xe9\x74";
+\x54\x68\xb8\x6e\x67\x20\x6d\xad\xea\x69\x20\x6d\xe9\x74\0";
   char *r = strptime (s, "%b", &tm);
   printf ("r = %p, r-s = %tu, tm.tm_mon = %d\n", r, r - s, tm.tm_mon);
-  return r == NULL || r - s != 14 || tm.tm_mon != 10;
+  result = r == NULL || r - s != 14 || tm.tm_mon != 10;
+
+  if (setlocale (LC_ALL, "ja_JP.UTF-8") == NULL)
+    {
+      puts ("cannot set locale");
+      return 1;
+    }
+  static const char s2[] = "\
+\x32\x35\x20\x30\x36\x20\xe5\xb9\xb3\xe6\x88\x90\x32\x30\0";
+  memset (&tm, '\0', sizeof (tm));
+  r = strptime (s2, "%d %m %EC%Ey", &tm);
+  printf ("\
+r = %p, r-s2 = %tu, tm.tm_mday = %d, tm.tm_mon = %d, tm.tm_year = %d\n",
+	  r, r - s2, tm.tm_mday, tm.tm_mon, tm.tm_year);
+  result |= (r == NULL || r - s2 != 14 || tm.tm_mday != 25 || tm.tm_mon != 5
+	     || tm.tm_year != 108);
+
+  static const char s3[] = "\
+\x32\x35\x20\x30\x36\x20\xe5\xb9\xb3\xe6\x88\x90\x32\x30\xe5\xb9\xb4\0";
+  memset (&tm, '\0', sizeof (tm));
+  r = strptime (s3, "%d %m %EY", &tm);
+  printf ("\
+r = %p, r-s3 = %tu, tm.tm_mday = %d, tm.tm_mon = %d, tm.tm_year = %d\n",
+	  r, r - s3, tm.tm_mday, tm.tm_mon, tm.tm_year);
+  result |= (r == NULL || r - s3 != 17 || tm.tm_mday != 25 || tm.tm_mon != 5
+	     || tm.tm_year != 108);
+
+  return result;
 }
 
 #define TEST_FUNCTION do_test ()