qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* de_DE.in: Adjust for correct handling of backward direction sorting.

This commit is contained in:
Ulrich Drepper 2007-10-02 17:17:59 +00:00
parent 80e069e0b2
commit 33a667def7
3 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
localedata/ChangeLog
View File

@ -1,3 +1,7 @@
2007-10-02 Ulrich Drepper <drepper@redhat.com>
* de_DE.in: Adjust for correct handling of backward direction sorting.
2007-10-01 Ulrich Drepper <drepper@redhat.com> 2007-10-01 Ulrich Drepper <drepper@redhat.com>
[BZ #4941] [BZ #4941]

6
localedata/de_DE.in
View File

@ -40,8 +40,8 @@ F
Fussel : fluff Fussel : fluff
fusseln : to wear of fluff fusseln : to wear of fluff
füßeln : play footsie [under the table] füßeln : play footsie [under the table]
fußen : to be based [on]
Füssen : Füssen (town) Füssen : Füssen (town)
fußen : to be based [on]
Füßen (dat. pl. of "Fuß") : [to the] feet Füßen (dat. pl. of "Fuß") : [to the] feet
in Massen : in large numbers in Massen : in large numbers
in Maßen : moderately in Maßen : moderately
@ -49,9 +49,9 @@ Masern : measels
Mass. (Massachusetts) : Massachusetts (state) Mass. (Massachusetts) : Massachusetts (state)
Maß : measure Maß : measure
Masse : mass Masse : mass
Massé : (particular billard stroke)
Maße (pl. of "Maß") : measures Maße (pl. of "Maß") : measures
mäße (pres. conj. of "messen") : take measure (e.g. in indirect speech) mäße (pres. conj. of "messen") : take measure (e.g. in indirect speech)
Massé : (particular billard stroke)
Massen- : mass; wholesale; bulk (in compound nouns) Massen- : mass; wholesale; bulk (in compound nouns)
massig : massive massig : massive
mäßig : moderate; modest mäßig : moderate; modest
@ -60,8 +60,8 @@ Mi
Passe : yoke (of dress) Passe : yoke (of dress)
passé : over, gone passé : over, gone
Schlagerforderung : claim, demanded in a pop song Schlagerforderung : claim, demanded in a pop song
Schlagerförderung : promotion of pop music
Schlägerforderung : demand of a hooligan Schlägerforderung : demand of a hooligan
Schlagerförderung : promotion of pop music
Schlägerförderung : promotion of hooliganism :-) Schlägerförderung : promotion of hooliganism :-)
Schurz : apron Schurz : apron
Schürze : apron Schürze : apron

24
string/strcoll_l.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1995,96,97,2002, 2004 Free Software Foundation, Inc. /* Copyright (C) 1995,96,97,2002, 2004, 2007 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Written by Ulrich Drepper <drepper@gnu.org>, 1995. Written by Ulrich Drepper <drepper@gnu.org>, 1995.
@ -128,7 +128,7 @@ STRCOLL (s1, s2, l)
Please note that the localedef programs makes sure that `position' Please note that the localedef programs makes sure that `position'
is not used at the first level. */ is not used at the first level. */
if (! __libc_use_alloca (s1len + s2len)) if (! __libc_use_alloca ((s1len + s2len) * (sizeof (int32_t) + 1)))
{ {
idx1arr = (int32_t *) malloc ((s1len + s2len) * (sizeof (int32_t) + 1)); idx1arr = (int32_t *) malloc ((s1len + s2len) * (sizeof (int32_t) + 1));
idx2arr = &idx1arr[s1len]; idx2arr = &idx1arr[s1len];
@ -186,7 +186,10 @@ STRCOLL (s1, s2, l)
/* The last pushed character was handled. Continue /* The last pushed character was handled. Continue
with forward characters. */ with forward characters. */
if (idx1cnt < idx1max) if (idx1cnt < idx1max)
idx1now = idx1cnt; {
idx1now = idx1cnt;
backw1_stop = ~0ul;
}
else else
/* Nothing anymore. The backward sequence ended with /* Nothing anymore. The backward sequence ended with
the last sequence in the string. Note that seq1len the last sequence in the string. Note that seq1len
@ -245,7 +248,10 @@ STRCOLL (s1, s2, l)
/* The last pushed character was handled. Continue /* The last pushed character was handled. Continue
with forward characters. */ with forward characters. */
if (idx2cnt < idx2max) if (idx2cnt < idx2max)
idx2now = idx2cnt; {
idx2now = idx2cnt;
backw2_stop = ~0ul;
}
else else
/* Nothing anymore. The backward sequence ended with /* Nothing anymore. The backward sequence ended with
the last sequence in the string. Note that seq2len the last sequence in the string. Note that seq2len
@ -370,7 +376,10 @@ STRCOLL (s1, s2, l)
/* The last pushed character was handled. Continue /* The last pushed character was handled. Continue
with forward characters. */ with forward characters. */
if (idx1cnt < idx1max) if (idx1cnt < idx1max)
idx1now = idx1cnt; {
idx1now = idx1cnt;
backw1_stop = ~0ul;
}
else else
{ {
/* Nothing anymore. The backward sequence /* Nothing anymore. The backward sequence
@ -426,7 +435,10 @@ STRCOLL (s1, s2, l)
/* The last pushed character was handled. Continue /* The last pushed character was handled. Continue
with forward characters. */ with forward characters. */
if (idx2cnt < idx2max) if (idx2cnt < idx2max)
idx2now = idx2cnt; {
idx2now = idx2cnt;
backw2_stop = ~0ul;
}
else else
{ {
/* Nothing anymore. The backward sequence /* Nothing anymore. The backward sequence