aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike FABIAN <mfabian@redhat.com>2017-12-13 14:39:54 +0100
committerMike FABIAN <mfabian@redhat.com>2018-02-27 16:56:25 +0100
commit0fc355d9a7b3cc9d5e4190ce929e1eb4459ef0ea (patch)
tree957b7b56c0646db83d986bfacc1073371cdd5d1b
parent43f3893f4b5679cb9eb93300b18f7febd17e5239 (diff)
downloadglibc-0fc355d9a7b3cc9d5e4190ce929e1eb4459ef0ea.tar
glibc-0fc355d9a7b3cc9d5e4190ce929e1eb4459ef0ea.tar.gz
glibc-0fc355d9a7b3cc9d5e4190ce929e1eb4459ef0ea.tar.bz2
glibc-0fc355d9a7b3cc9d5e4190ce929e1eb4459ef0ea.zip
Collation order of @-. and space has changed in new iso14651_t1_common file, adapt test files
* localedata/da_DK.ISO-8859-1.in: In the new iso14651_t1_common file downloaded from ISO, the collation order of @-. and space has changed. Therefore, this test file needed to be adapted. * localedata/fr_CA.UTF-8.in: Likewise. * localedata/fr_FR.UTF-8.in: Likewise. * localedata/uk_UA.UTF-8.in: Likewise.
-rw-r--r--ChangeLog9
-rw-r--r--localedata/da_DK.ISO-8859-1.in4
-rw-r--r--localedata/fr_CA.UTF-8.in9
-rw-r--r--localedata/fr_FR.UTF-8.in9
-rw-r--r--localedata/uk_UA.UTF-8.in4
5 files changed, 23 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 1121673ba0..954763fac7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2018-02-27 Mike FABIAN <mfabian@redhat.com>
+ * localedata/da_DK.ISO-8859-1.in: In the new iso14651_t1_common file
+ downloaded from ISO, the collation order of @-. and space has changed.
+ Therefore, this test file needed to be adapted.
+ * localedata/fr_CA.UTF-8.in: Likewise.
+ * localedata/fr_FR.UTF-8.in: Likewise.
+ * localedata/uk_UA.UTF-8.in: Likewise.
+
+2018-02-27 Mike FABIAN <mfabian@redhat.com>
+
* localedata/cs_CZ.UTF-8.in: adapt this test file to the collation
order of ȥ in the new iso14651_t1_common file.
* localedata/pl_PL.UTF-8.in: Likewise.
diff --git a/localedata/da_DK.ISO-8859-1.in b/localedata/da_DK.ISO-8859-1.in
index e9d2620d5d..9a0e7bc04d 100644
--- a/localedata/da_DK.ISO-8859-1.in
+++ b/localedata/da_DK.ISO-8859-1.in
@@ -2,8 +2,8 @@ A
ANDRE
ANDR
ANDREAS
-AS
A/S
+AS
CA
A
CB
@@ -12,8 +12,8 @@ DA
A
DB
C
-DSB
D.S.B.
+DSB
DSC
EKSTRA-ARBEJDE
EKSTRABUD
diff --git a/localedata/fr_CA.UTF-8.in b/localedata/fr_CA.UTF-8.in
index 1c05d69f5a..c98a8e7fb8 100644
--- a/localedata/fr_CA.UTF-8.in
+++ b/localedata/fr_CA.UTF-8.in
@@ -4,8 +4,8 @@
Aalborg
aide
aïeul
-air
@@@air
+air
air@@@
Ålborg
août
@@ -22,10 +22,10 @@ casanier
cølibat
colon
côlon
-COOP
CO-OP
-coop
+COOP
co-op
+coop
Copenhagen
COTE
cote
@@ -58,8 +58,9 @@ lésé
L'Haÿ-les-Roses
MÂCON
maçon
-McArthur
Mc Arthur
+McArthur
+Mc Arthurb
Mc Mahon
MODÈLE
modelé
diff --git a/localedata/fr_FR.UTF-8.in b/localedata/fr_FR.UTF-8.in
index 070eb4dc0d..f719dc2210 100644
--- a/localedata/fr_FR.UTF-8.in
+++ b/localedata/fr_FR.UTF-8.in
@@ -4,8 +4,8 @@
Aalborg
aide
aïeul
-air
@@@air
+air
air@@@
Ålborg
août
@@ -22,10 +22,10 @@ casanier
cølibat
colon
côlon
-coop
co-op
-COOP
+coop
CO-OP
+COOP
Copenhagen
cote
COTE
@@ -58,8 +58,9 @@ lèse
L'Haÿ-les-Roses
maçon
MÂCON
-McArthur
Mc Arthur
+McArthur
+Mc Arthurb
Mc Mahon
modelé
MODÈLE
diff --git a/localedata/uk_UA.UTF-8.in b/localedata/uk_UA.UTF-8.in
index ff4d284d61..14ee847d9c 100644
--- a/localedata/uk_UA.UTF-8.in
+++ b/localedata/uk_UA.UTF-8.in
@@ -10,11 +10,11 @@
ґрати
ебонітовий
експорт
-експосол
екс-посол
+експосол
експоцентр
-експрацівник
екс-працівник
+експрацівник
еластичність
електрика
ельбор