mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-08 14:20:07 +00:00
hr_HR locale: fix collation and expand collation test file
* localedata/locales/hr_HR (LC_COLLATE): Fix collation to make test case pass. * localedata/hr_HR.UTF-8.in: Add more test strings.
This commit is contained in:
Mike FABIAN
parent
cf4341ca90
commit
5e56e937c9
@ -1,3 +1,9 @@
|
|||||||
|
2017-11-30 Mike FABIAN <mfabian@redhat.com>
|
||||||
|
|
||||||
|
* localedata/locales/hr_HR (LC_COLLATE): Fix collation
|
||||||
|
to make test case pass.
|
||||||
|
* localedata/hr_HR.UTF-8.in: Add more test strings.
|
||||||
|
|
||||||
2017-11-30 Mike FABIAN <mfabian@redhat.com>
|
2017-11-30 Mike FABIAN <mfabian@redhat.com>
|
||||||
|
|
||||||
* stdlib/tst-strfmon_l.c: Fix testcase. Needed because of [BZ #10580]
|
* stdlib/tst-strfmon_l.c: Fix testcase. Needed because of [BZ #10580]
|
||||||
|
|||||||
@ -6,7 +6,23 @@ cvrčić
|
|||||||
ćutjeti
|
ćutjeti
|
||||||
Dalekovidan
|
Dalekovidan
|
||||||
disharmoničan
|
disharmoničan
|
||||||
|
dza
|
||||||
|
ĎŽ
|
||||||
|
dž
|
||||||
|
dž
|
||||||
|
dŽ
|
||||||
|
Dž
|
||||||
|
Dž
|
||||||
|
DŽ
|
||||||
|
DŽ
|
||||||
|
dža
|
||||||
|
džepni
|
||||||
|
džepni
|
||||||
|
dŽepni
|
||||||
|
Džepni
|
||||||
Džepni
|
Džepni
|
||||||
|
DŽepni
|
||||||
|
DŽepni
|
||||||
Džersej
|
Džersej
|
||||||
DŽezistički
|
DŽezistički
|
||||||
džip
|
džip
|
||||||
@ -18,14 +34,25 @@ Edicija
|
|||||||
Lakovjeran
|
Lakovjeran
|
||||||
limunčić
|
limunčić
|
||||||
lJekovito
|
lJekovito
|
||||||
|
ljenivac
|
||||||
|
ljenivac
|
||||||
|
Ljenivac
|
||||||
Ljenivac
|
Ljenivac
|
||||||
|
LJenivac
|
||||||
|
LJenivac
|
||||||
Ljepljiv
|
Ljepljiv
|
||||||
ljeskov
|
ljeskov
|
||||||
ljetni
|
ljetni
|
||||||
LJutiti
|
LJutiti
|
||||||
Mačić
|
Mačić
|
||||||
natočiti
|
natočiti
|
||||||
|
njedra
|
||||||
|
njedra
|
||||||
nJedra
|
nJedra
|
||||||
|
Njedra
|
||||||
|
Njedra
|
||||||
|
NJedra
|
||||||
|
NJedra
|
||||||
NJegovateljica
|
NJegovateljica
|
||||||
Njemački
|
Njemački
|
||||||
njihalo
|
njihalo
|
||||||
|
|||||||
@ -67,8 +67,16 @@ END LC_CTYPE
|
|||||||
LC_COLLATE
|
LC_COLLATE
|
||||||
copy "iso14651_t1"
|
copy "iso14651_t1"
|
||||||
|
|
||||||
% define collating elements which should be considered
|
% CLDR collation rules for Croatian
|
||||||
% as if they are digraphs while collating
|
% (see: https://unicode.org/cldr/trac/browser/trunk/common/collation/hr.xml):
|
||||||
|
% &C<č<<<Č<ć<<<Ć
|
||||||
|
% &D<dž<<<dž<<<Dž<<<Dž<<<DŽ<<<DŽ<đ<<<Đ
|
||||||
|
% &L<lj<<<lj<<<Lj<<<Lj<<<LJ<<<LJ
|
||||||
|
% &N<nj<<<nj<<<Nj<<<Nj<<<NJ<<<NJ
|
||||||
|
% &S<š<<<Š
|
||||||
|
% &Z<ž<<<Ž
|
||||||
|
%
|
||||||
|
% The following rules implement the same order for glibc:
|
||||||
|
|
||||||
% Digraphs dŽ, lJ and nJ (1st char lower, 2nd char upper)
|
% Digraphs dŽ, lJ and nJ (1st char lower, 2nd char upper)
|
||||||
% are clearly errors and you'd be hard pressed to
|
% are clearly errors and you'd be hard pressed to
|
||||||
@ -91,9 +99,6 @@ collating-element <N-j> from "<U004E><U006A>"
|
|||||||
collating-element <n-J> from "<U006E><U004A>"
|
collating-element <n-J> from "<U006E><U004A>"
|
||||||
collating-element <n-j> from "<U006E><U006A>"
|
collating-element <n-j> from "<U006E><U006A>"
|
||||||
|
|
||||||
|
|
||||||
% <U01C6> {}, <U01C9> {} and <U01CC> {}
|
|
||||||
% make č, ć, dž, đ, lj, nj, š and ž distinct letters
|
|
||||||
collating-symbol <ccaron>
|
collating-symbol <ccaron>
|
||||||
collating-symbol <cacute>
|
collating-symbol <cacute>
|
||||||
collating-symbol <d-z-sh>
|
collating-symbol <d-z-sh>
|
||||||
@ -103,13 +108,10 @@ collating-symbol <n-j-sh>
|
|||||||
collating-symbol <scaron>
|
collating-symbol <scaron>
|
||||||
collating-symbol <zcaron>
|
collating-symbol <zcaron>
|
||||||
|
|
||||||
% order them as:
|
|
||||||
% a b c č ć d dž đ e f g h i j k l lj m n nj o p r s š t u v z ž
|
|
||||||
|
|
||||||
reorder-after <c>
|
reorder-after <c>
|
||||||
<ccaron>
|
<ccaron>
|
||||||
<cacute>
|
<cacute>
|
||||||
<d>
|
reorder-after <d>
|
||||||
<d-z-sh>
|
<d-z-sh>
|
||||||
<doblique>
|
<doblique>
|
||||||
reorder-after <l>
|
reorder-after <l>
|
||||||
@ -121,58 +123,44 @@ reorder-after <s>
|
|||||||
reorder-after <z>
|
reorder-after <z>
|
||||||
<zcaron>
|
<zcaron>
|
||||||
|
|
||||||
% c č ć
|
<U010D> <ccaron>;<ACA>;<MIN>;IGNORE % č
|
||||||
reorder-after <U0063>
|
<U010C> <ccaron>;<ACA>;<CAP>;IGNORE % Č
|
||||||
<U010D> <ccaron>;<ACA>;<MIN>;IGNORE
|
<U0107> <cacute>;<CAR>;<MIN>;IGNORE % ć
|
||||||
<U0107> <cacute>;<CAR>;<MIN>;IGNORE
|
<U0106> <cacute>;<CAR>;<CAP>;IGNORE % Ć
|
||||||
reorder-after <U0043>
|
|
||||||
<U010C> <ccaron>;<ACA>;<CAP>;IGNORE
|
|
||||||
<U0106> <cacute>;<CAR>;<CAP>;IGNORE
|
|
||||||
|
|
||||||
% d, dž and đ
|
<d-z<> "<d-z-sh>";"<BAS><CAR>";"<MIN><MIN><BAS>";IGNORE % dž
|
||||||
% give <d-z> collating elements collating value of dž
|
<U01C6> "<d-z-sh>";"<BAS><CAR>";"<MIN><MIN><LIG>";IGNORE % dž
|
||||||
reorder-after <U01C6>
|
<d-Z<> "<d-z-sh>";"<BAS><CAR>";"<MIN><CAP><BAS>";IGNORE % dŽ
|
||||||
<d-z<> "<d><z>";"<BAS><CAR>";"<MIN><MIN>";IGNORE
|
<D-z<> "<d-z-sh>";"<BAS><CAR>";"<CAP><MIN><BAS>";IGNORE % Dž
|
||||||
<d-Z<> "<d><z>";"<BAS><CAR>";"<MIN><CAP>";IGNORE
|
<U01C5> "<d-z-sh>";"<BAS><CAR>";"<CAP><MIN><LIG>";IGNORE % Dž
|
||||||
<U0111> <doblique>;<OBL>;<MIN>;IGNORE
|
<D-Z<> "<d-z-sh>";"<BAS><CAR>";"<CAP><CAP><BAS>";IGNORE % DŽ
|
||||||
reorder-after <U01C4>
|
<U01C4> "<d-z-sh>";"<BAS><CAR>";"<CAP><CAP><LIG>";IGNORE % DŽ
|
||||||
<D-Z<> "<d><z>";"<BAS><CAR>";"<CAP><CAP>";IGNORE
|
<U0111> <doblique>;<OBL>;<MIN>;IGNORE % đ
|
||||||
reorder-after <U01C5>
|
<U0110> <doblique>;<OBL>;<CAP>;IGNORE % Đ
|
||||||
<D-z<> "<d><z>";"<BAS><CAR>";"<CAP><MIN>";IGNORE
|
|
||||||
<U0110> <doblique>;<OBL>;<CAP>;IGNORE
|
|
||||||
|
|
||||||
% give <l-j> collating elements collating value of lj
|
<l-j> "<l-j-sh>";"<BAS><BAS>";"<MIN><MIN><BAS>";IGNORE % lj
|
||||||
reorder-after <U01C9>
|
<U01C9> "<l-j-sh>";"<BAS><BAS>";"<MIN><MIN><LIG>";IGNORE % lj
|
||||||
<l-j> "<l><j>";"<BAS><BAS>";"<MIN><MIN>";IGNORE
|
<l-J> "<l-j-sh>";"<BAS><BAS>";"<MIN><CAP><BAS>";IGNORE % lJ
|
||||||
<l-J> "<l><j>";"<BAS><BAS>";"<MIN><CAP>";IGNORE
|
<L-j> "<l-j-sh>";"<BAS><BAS>";"<CAP><MIN><BAS>";IGNORE % Lj
|
||||||
reorder-after <U01C7>
|
<U01C8> "<l-j-sh>";"<BAS><BAS>";"<CAP><MIN><LIG>";IGNORE % Lj
|
||||||
<L-J> "<l><j>";"<BAS><BAS>";"<CAP><CAP>";IGNORE
|
<L-J> "<l-j-sh>";"<BAS><BAS>";"<CAP><CAP><BAS>";IGNORE % LJ
|
||||||
reorder-after <U01C8>
|
<U01C7> "<l-j-sh>";"<BAS><BAS>";"<CAP><CAP><LIG>";IGNORE % LJ
|
||||||
<L-j> "<l><j>";"<BAS><BAS>";"<CAP><MIN>";IGNORE
|
|
||||||
|
|
||||||
% give <n-j> collating elements collating value of nj
|
<n-j> "<n-j-sh>";"<BAS><BAS>";"<MIN><MIN><BAS>";IGNORE % nj
|
||||||
reorder-after <U01CC>
|
<U01CC> "<n-j-sh>";"<BAS><BAS>";"<MIN><MIN><LIG>";IGNORE % nj
|
||||||
<n-j> "<n><j>";"<BAS><BAS>";"<MIN><MIN>";IGNORE
|
<n-J> "<n-j-sh>";"<BAS><BAS>";"<MIN><CAP><BAS>";IGNORE % nJ
|
||||||
<n-J> "<n><j>";"<BAS><BAS>";"<MIN><CAP>";IGNORE
|
<N-j> "<n-j-sh>";"<BAS><BAS>";"<CAP><MIN><BAS>";IGNORE % Nj
|
||||||
reorder-after <U01CA>
|
<U01CB> "<n-j-sh>";"<BAS><BAS>";"<CAP><MIN><LIG>";IGNORE % Nj
|
||||||
<N-J> "<n><j>";"<BAS><BAS>";"<CAP><CAP>";IGNORE
|
<N-J> "<n-j-sh>";"<BAS><BAS>";"<CAP><CAP><BAS>";IGNORE % NJ
|
||||||
reorder-after <U01CB>
|
<U01CA> "<n-j-sh>";"<BAS><BAS>";"<CAP><CAP><LIG>";IGNORE % NJ
|
||||||
<N-j> "<n><j>";"<BAS><BAS>";"<CAP><MIN>";IGNORE
|
|
||||||
|
|
||||||
% s š
|
<U0161> <scaron>;<ACA>;<MIN>;IGNORE % š
|
||||||
reorder-after <U0073>
|
<U0160> <scaron>;<ACA>;<CAP>;IGNORE % Š
|
||||||
<U0161> <scaron>;<ACA>;<MIN>;IGNORE
|
|
||||||
reorder-after <U0053>
|
|
||||||
<U0160> <scaron>;<ACA>;<CAP>;IGNORE
|
|
||||||
|
|
||||||
% z ž
|
<U017E> <zcaron>;<ACA>;<MIN>;IGNORE % ž
|
||||||
reorder-after <U007A>
|
<U017D> <zcaron>;<ACA>;<CAP>;IGNORE % Ž
|
||||||
<U017E> <zcaron>;<ACA>;<MIN>;IGNORE
|
|
||||||
reorder-after <U005A>
|
|
||||||
<U017D> <zcaron>;<ACA>;<CAP>;IGNORE
|
|
||||||
|
|
||||||
reorder-end
|
reorder-end
|
||||||
|
|
||||||
END LC_COLLATE
|
END LC_COLLATE
|
||||||
|
|
||||||
LC_MESSAGES
|
LC_MESSAGES
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user