diff options
author | Jakub Jelinek <jakub@redhat.com> | 2007-10-14 21:12:41 +0000 |
---|---|---|
committer | Jakub Jelinek <jakub@redhat.com> | 2007-10-14 21:12:41 +0000 |
commit | 68a071d274b5bd3049ab3ec7cd5cbb901aa95ccd (patch) | |
tree | 4b908f231d5da7a2b68824fe1904546a8a43a9ee | |
parent | a33c43a5aefbbb2d1e00432ba034d256af0008ae (diff) |
Updated to fedora-glibc-20071014T2102cvs/fedora-glibc-2_6_90-20
-rw-r--r-- | fedora/branch.mk | 4 | ||||
-rw-r--r-- | fedora/glibc.spec.in | 1 | ||||
-rw-r--r-- | localedata/ChangeLog | 6 | ||||
-rw-r--r-- | localedata/locales/pl_PL | 38 | ||||
-rw-r--r-- | localedata/show-ucs-data.c | 7 |
5 files changed, 34 insertions, 22 deletions
diff --git a/fedora/branch.mk b/fedora/branch.mk index c9056799ce..a457caf781 100644 --- a/fedora/branch.mk +++ b/fedora/branch.mk @@ -3,5 +3,5 @@ glibc-branch := fedora glibc-base := HEAD DIST_BRANCH := devel COLLECTION := dist-f8 -fedora-sync-date := 2007-10-14 18:47 UTC -fedora-sync-tag := fedora-glibc-20071014T1847 +fedora-sync-date := 2007-10-14 21:02 UTC +fedora-sync-tag := fedora-glibc-20071014T2102 diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in index 084231ca17..82bbe2d241 100644 --- a/fedora/glibc.spec.in +++ b/fedora/glibc.spec.in @@ -1014,6 +1014,7 @@ rm -f *.filelist* - install <bits/error.h> (#330031) - disable -D_FORTIFY_SOURCE{,=2} support (with a warning) for GCC 3.4.x and earlier(#327641) +- pl_PL locale changes (BZ#4098, #242296) - misc fixes (BZ#1140, BZ#3195, BZ#3242, BZ#4359) * Thu Oct 11 2007 Jakub Jelinek <jakub@redhat.com> 2.6.90-19 diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 934f5d4ee4..784f71d1b4 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,9 @@ +2007-10-14 Ulrich Drepper <drepper@redhat.com> + + [BZ #4098] + * locales/pl_PL: Change abmon, abday, and d_fmt according to + results of vote. + 2007-10-10 Ulrich Drepper <drepper@redhat.com> * locales/iso14651_t1_common: If DIACRIT_FORWARD is defined, define diff --git a/localedata/locales/pl_PL b/localedata/locales/pl_PL index 2f17b364f4..0527eee519 100644 --- a/localedata/locales/pl_PL +++ b/localedata/locales/pl_PL @@ -2150,13 +2150,17 @@ grouping 0;0 END LC_NUMERIC LC_TIME -abday "<U004E>";/ - "<U0050><U006E>";/ - "<U0057><U0074>";/ - "<U015A><U0072>";/ - "<U0043><U007A>";/ - "<U0050><U0074>";/ - "<U0053><U006F>" +% The abday, abmon, and d_fmt information has been changed (back) to match +% the preference expressed in the poll organized to get some concensus. +% The results were not entirely clear on all easpects but the choices +% here seem to have the most support. For more details: +% +% https://bugzilla.redhat.com/show_bug.cgi?id=242296 +% +abday "<U006E><U0069><U0065>";"<U0070><U006F><U006E>";/ + "<U0077><U0074><U006F>";"<U015B><U0072><U006F>";/ + "<U0063><U007A><U0077>";"<U0070><U0069><U0105>";/ + "<U0073><U006F><U0062>" day "<U006E><U0069><U0065><U0064><U007A><U0069><U0065><U006C><U0061>";/ "<U0070><U006F><U006E><U0069><U0065><U0064><U007A><U0069><U0061><U0142><U0065><U006B>";/ "<U0077><U0074><U006F><U0072><U0065><U006B>";/ @@ -2164,18 +2168,12 @@ day "<U006E><U0069><U0065><U0064><U007A><U0069><U0065><U006C><U0061>";/ "<U0063><U007A><U0077><U0061><U0072><U0074><U0065><U006B>";/ "<U0070><U0069><U0105><U0074><U0065><U006B>";/ "<U0073><U006F><U0062><U006F><U0074><U0061>" -abmon "<U0049>";/ - "<U0049><U0049>";/ - "<U0049><U0049><U0049>";/ - "<U0049><U0056>";/ - "<U0056>";/ - "<U0056><U0049>";/ - "<U0056><U0049><U0049>";/ - "<U0056><U0049><U0049><U0049>";/ - "<U0049><U0058>";/ - "<U0058>";/ - "<U0058><U0049>";/ - "<U0058><U0049><U0049>" +abmon "<U0073><U0074><U0079>";"<U006C><U0075><U0074>";/ + "<U006D><U0061><U0072>";"<U006B><U0077><U0069>";/ + "<U006D><U0061><U006A>";"<U0063><U007A><U0065>";/ + "<U006C><U0069><U0070>";"<U0073><U0069><U0065>";/ + "<U0077><U0072><U007A>";"<U0070><U0061><U017A>";/ + "<U006C><U0069><U0073>";"<U0067><U0072><U0075>" mon "<U0073><U0074><U0079><U0063><U007A><U0065><U0144>";/ "<U006C><U0075><U0074><U0079>";/ "<U006D><U0061><U0072><U007A><U0065><U0063>";/ @@ -2191,7 +2189,7 @@ mon "<U0073><U0074><U0079><U0063><U007A><U0065><U0144>";/ d_t_fmt "<U0025><U0061><U002C><U0020>/ <U0025><U002D><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U002C><U0020>/ <U0025><U0054>" -d_fmt "<U0025><U002D><U0064><U0020><U0025><U0062><U0020><U0025><U0059>" +d_fmt "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0059>" t_fmt "<U0025><U0054>" am_pm "";"" t_fmt_ampm "" diff --git a/localedata/show-ucs-data.c b/localedata/show-ucs-data.c index 9992ece427..85d2659741 100644 --- a/localedata/show-ucs-data.c +++ b/localedata/show-ucs-data.c @@ -10,6 +10,13 @@ main (int argc, char *argv[]) char *line = NULL; size_t len = 0; + if (argc == 1) + { + static char *new_argv[] = { NULL, (char *) "/dev/stdin", NULL }; + argv = new_argv; + argc = 2; + } + for (n = 1; n < argc; ++n) { FILE *fp = fopen (argv[n], "r"); |