From 9ca6b343783236fda88e9712f29b46ec875d4156 Mon Sep 17 00:00:00 2001 From: Dragan Stanojević - Nevidljivi Date: Thu, 30 Nov 2017 10:02:55 +0100 Subject: Add test case for collation in hr_HR locale * localedata/Makefile: Add hr_HR.UTF-8 to test-input and to the list of locales to built for testing. * localedata/hr_HR.UTF-8.in: New file. --- localedata/hr_HR.UTF-8.in | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 localedata/hr_HR.UTF-8.in (limited to 'localedata/hr_HR.UTF-8.in') diff --git a/localedata/hr_HR.UTF-8.in b/localedata/hr_HR.UTF-8.in new file mode 100644 index 0000000000..c33ee6a614 --- /dev/null +++ b/localedata/hr_HR.UTF-8.in @@ -0,0 +1,43 @@ +Ceremonijalan +cvrčić +Čamac +čempres +Ćakula +ćutjeti +Dalekovidan +disharmoničan +Džepni +Džersej +DŽezistički +džip +džungla +dŽus +Đavolica +đuveč +Edicija +Lakovjeran +limunčić +lJekovito +Ljenivac +Ljepljiv +ljeskov +ljetni +LJutiti +Mačić +natočiti +nJedra +NJegovateljica +Njemački +njihalo +Njisak +njuškalo +Obavještavanje +satiričar +Sova +Šegrtski +šišmiš +Tiraža +zamjetljiv +Zemljovlasnički +Žalopojka +žičica -- cgit v1.2.3 From 5e56e937c9144e70a16793d2c5aa22d1bd0b2c18 Mon Sep 17 00:00:00 2001 From: Mike FABIAN Date: Thu, 30 Nov 2017 12:13:02 +0100 Subject: 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. --- ChangeLog | 6 +++ localedata/hr_HR.UTF-8.in | 27 ++++++++++++ localedata/locales/hr_HR | 106 ++++++++++++++++++++-------------------------- 3 files changed, 80 insertions(+), 59 deletions(-) (limited to 'localedata/hr_HR.UTF-8.in') diff --git a/ChangeLog b/ChangeLog index a3c2c750bb..44f46d2dc6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2017-11-30 Mike FABIAN + + * 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 * stdlib/tst-strfmon_l.c: Fix testcase. Needed because of [BZ #10580] diff --git a/localedata/hr_HR.UTF-8.in b/localedata/hr_HR.UTF-8.in index c33ee6a614..72f04bd7f0 100644 --- a/localedata/hr_HR.UTF-8.in +++ b/localedata/hr_HR.UTF-8.in @@ -6,7 +6,23 @@ cvrčić ćutjeti Dalekovidan 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žersej DŽezistički džip @@ -18,14 +34,25 @@ Edicija Lakovjeran limunčić lJekovito +ljenivac +ljenivac +Ljenivac Ljenivac +LJenivac +LJenivac Ljepljiv ljeskov ljetni LJutiti Mačić natočiti +njedra +njedra nJedra +Njedra +Njedra +NJedra +NJedra NJegovateljica Njemački njihalo diff --git a/localedata/locales/hr_HR b/localedata/locales/hr_HR index 184364288c..a3b3a75387 100644 --- a/localedata/locales/hr_HR +++ b/localedata/locales/hr_HR @@ -67,8 +67,16 @@ END LC_CTYPE LC_COLLATE copy "iso14651_t1" -% define collating elements which should be considered -% as if they are digraphs while collating +% CLDR collation rules for Croatian +% (see: https://unicode.org/cldr/trac/browser/trunk/common/collation/hr.xml): +% &C<č<<<Č<ć<<<Ć +% &D from "" collating-element from "" collating-element from "" - -% {}, {} and {} -% make č, ć, dž, đ, lj, nj, š and ž distinct letters collating-symbol collating-symbol collating-symbol @@ -103,13 +108,10 @@ collating-symbol collating-symbol collating-symbol -% 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 - +reorder-after reorder-after @@ -121,58 +123,44 @@ reorder-after reorder-after -% c č ć -reorder-after - ;;;IGNORE - ;;;IGNORE -reorder-after - ;;;IGNORE - ;;;IGNORE - -% d, dž and đ -% give collating elements collating value of dž -reorder-after - "";"";"";IGNORE - "";"";"";IGNORE - ;;;IGNORE -reorder-after - "";"";"";IGNORE -reorder-after - "";"";"";IGNORE - ;;;IGNORE - -% give collating elements collating value of lj -reorder-after - "";"";"";IGNORE - "";"";"";IGNORE -reorder-after - "";"";"";IGNORE -reorder-after - "";"";"";IGNORE - -% give collating elements collating value of nj -reorder-after - "";"";"";IGNORE - "";"";"";IGNORE -reorder-after - "";"";"";IGNORE -reorder-after - "";"";"";IGNORE - -% s š -reorder-after - ;;;IGNORE -reorder-after - ;;;IGNORE - -% z ž -reorder-after - ;;;IGNORE -reorder-after - ;;;IGNORE + ;;;IGNORE % č + ;;;IGNORE % Č + ;;;IGNORE % ć + ;;;IGNORE % Ć + + "";"";"";IGNORE % dž + "";"";"";IGNORE % dž + "";"";"";IGNORE % dŽ + "";"";"";IGNORE % Dž + "";"";"";IGNORE % Dž + "";"";"";IGNORE % DŽ + "";"";"";IGNORE % DŽ + ;;;IGNORE % đ + ;;;IGNORE % Đ + + "";"";"";IGNORE % lj + "";"";"";IGNORE % lj + "";"";"";IGNORE % lJ + "";"";"";IGNORE % Lj + "";"";"";IGNORE % Lj + "";"";"";IGNORE % LJ + "";"";"";IGNORE % LJ + + "";"";"";IGNORE % nj + "";"";"";IGNORE % nj + "";"";"";IGNORE % nJ + "";"";"";IGNORE % Nj + "";"";"";IGNORE % Nj + "";"";"";IGNORE % NJ + "";"";"";IGNORE % NJ + + ;;;IGNORE % š + ;;;IGNORE % Š + + ;;;IGNORE % ž + ;;;IGNORE % Ž reorder-end - END LC_COLLATE LC_MESSAGES -- cgit v1.2.3