aboutsummaryrefslogtreecommitdiff
path: root/localedata/locales
diff options
context:
space:
mode:
authorAlexandre Oliva <aoliva@redhat.com>2017-11-28 16:23:02 +0100
committerMike FABIAN <mfabian@redhat.com>2017-11-29 11:56:46 +0100
commit8da25eec0aaf4d86a06088fff8d175989835e071 (patch)
treeb1ed2f0f98e9b3c3cbc3e728bb2e99b27d083fd4 /localedata/locales
parenta55430cb0e261834ce7a4e118dd9e0f2b7fb14bc (diff)
downloadglibc-8da25eec0aaf4d86a06088fff8d175989835e071.zip
glibc-8da25eec0aaf4d86a06088fff8d175989835e071.tar.gz
glibc-8da25eec0aaf4d86a06088fff8d175989835e071.tar.bz2
Collation fix: make forward accent sorting the default [BZ #17750]
[BZ #17750] * Makefile: add fr_CA.UTF-8 to test-input and LOCALES. * localedata/fr_CA.UTF-8.in: New file with test data for backward accents sorting. * localedata/fr_FR.UTF-8.in: Fix test data for forward accents sorting. * localedata/locales/cs_CZ (LC_COLLATE): Remove “define DIACRIT_FORWARD” * localedata/locales/de_DE (LC_COLLATE): Likewise. * localedata/locales/hu_HU (LC_COLLATE): Likewise. * localedata/locales/lb_LU (LC_COLLATE): Likewise. * localedata/locales/yuw_PG (LC_COLLATE): Likewise. * localedata/locales/fr_CA (LC_COLLATE): Add “define DIACRIT_BACKWARD” * localedata/locales/iso14651_t1_common: Use “ifdef DIACRIT_FORWARD” instead of “ifdef DIACRIT_BACKWARD”. The only locale which currently needs backward accents sorting is fr_CA. Therefore, forward accents sorting should be the default. Before this patch, backwards accent sorting was the default and all locales except fr_CA had to use define DIACRIT_FORWARD before copy "iso14651_t1" Most locales didn’t do that and thus got the inappropriate backwards accents sorting by accident. Now only the fr_CA locale needs to use define DIACRIT_BACKWARD before copy "iso14651_t1" Original patch slightly modified by: Mike FABIAN <mfabian@redhat.com>
Diffstat (limited to 'localedata/locales')
-rw-r--r--localedata/locales/cs_CZ2
-rw-r--r--localedata/locales/de_DE2
-rw-r--r--localedata/locales/fr_CA2
-rw-r--r--localedata/locales/hu_HU1
-rw-r--r--localedata/locales/iso14651_t1_common6
-rw-r--r--localedata/locales/lb_LU2
-rw-r--r--localedata/locales/yuw_PG1
7 files changed, 5 insertions, 11 deletions
diff --git a/localedata/locales/cs_CZ b/localedata/locales/cs_CZ
index 163a40d..f80d3e1 100644
--- a/localedata/locales/cs_CZ
+++ b/localedata/locales/cs_CZ
@@ -140,8 +140,6 @@ END LC_IDENTIFICATION
LC_COLLATE
-define DIACRIT_FORWARD
-
copy "iso14651_t1"
collating-symbol <c-caron>
diff --git a/localedata/locales/de_DE b/localedata/locales/de_DE
index dd1c1cf..eaa9f7f 100644
--- a/localedata/locales/de_DE
+++ b/localedata/locales/de_DE
@@ -84,8 +84,6 @@ END LC_CTYPE
LC_COLLATE
-define DIACRIT_FORWARD
-
% Copy the template from ISO/IEC 14651
copy "iso14651_t1"
diff --git a/localedata/locales/fr_CA b/localedata/locales/fr_CA
index 15401de..e37d042 100644
--- a/localedata/locales/fr_CA
+++ b/localedata/locales/fr_CA
@@ -54,6 +54,8 @@ copy "fr_FR"
END LC_CTYPE
LC_COLLATE
+define DIACRIT_BACKWARD
+
copy "en_CA"
END LC_COLLATE
diff --git a/localedata/locales/hu_HU b/localedata/locales/hu_HU
index b860672..01e45b9 100644
--- a/localedata/locales/hu_HU
+++ b/localedata/locales/hu_HU
@@ -63,7 +63,6 @@ category "i18n:2012";LC_MEASUREMENT
END LC_IDENTIFICATION
LC_COLLATE
-define DIACRIT_FORWARD
copy "iso14651_t1"
%% a b c cs d dz dzs e f g gy h i j k l ly m n ny o o: p q
diff --git a/localedata/locales/iso14651_t1_common b/localedata/locales/iso14651_t1_common
index 0e64f26..eb0fe9e 100644
--- a/localedata/locales/iso14651_t1_common
+++ b/localedata/locales/iso14651_t1_common
@@ -5079,10 +5079,10 @@ order_start <SPECIAL>;forward;backward;forward;forward,position
<U009E> IGNORE;IGNORE;IGNORE;<U009E>
<U009F> IGNORE;IGNORE;IGNORE;<U009F>
-ifdef DIACRIT_FORWARD
-order_start <LATIN>;forward;forward;forward;forward,position
-else
+ifdef DIACRIT_BACKWARD
order_start <LATIN>;forward;backward;forward;forward,position
+else
+order_start <LATIN>;forward;forward;forward;forward,position
endif
#
<U00A0> <U0020>;<BAS>;<MIN>;IGNORE # 170<NBSP>
diff --git a/localedata/locales/lb_LU b/localedata/locales/lb_LU
index f8da944..92f1e22 100644
--- a/localedata/locales/lb_LU
+++ b/localedata/locales/lb_LU
@@ -83,8 +83,6 @@ END LC_CTYPE
LC_COLLATE
-define DIACRIT_FORWARD
-
% Copy the template from ISO/IEC 14651
copy "iso14651_t1"
diff --git a/localedata/locales/yuw_PG b/localedata/locales/yuw_PG
index f9341fa..0cb3cad 100644
--- a/localedata/locales/yuw_PG
+++ b/localedata/locales/yuw_PG
@@ -45,7 +45,6 @@ translit_end
END LC_CTYPE
LC_COLLATE
-define DIACRIT_FORWARD
copy "iso14651_t1"
END LC_COLLATE