summary refs log tree commit diff
path: root/localedata/fr_CA.UTF-8.in
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/fr_CA.UTF-8.in
parenta55430cb0e261834ce7a4e118dd9e0f2b7fb14bc (diff)
downloadglibc-8da25eec0aaf4d86a06088fff8d175989835e071.tar.gz
glibc-8da25eec0aaf4d86a06088fff8d175989835e071.tar.xz
glibc-8da25eec0aaf4d86a06088fff8d175989835e071.zip
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/fr_CA.UTF-8.in')
-rw-r--r--localedata/fr_CA.UTF-8.in96
1 files changed, 96 insertions, 0 deletions
diff --git a/localedata/fr_CA.UTF-8.in b/localedata/fr_CA.UTF-8.in
new file mode 100644
index 0000000000..1c05d69f5a
--- /dev/null
+++ b/localedata/fr_CA.UTF-8.in
@@ -0,0 +1,96 @@
+@@@@@
+0000
+9999
+Aalborg
+aide
+aïeul
+air
+@@@air
+air@@@
+Ålborg
+août
+bohème
+Bohême
+Bohémien
+caennais
+cæsium
+çà et là
+C.A.F.
+Canon
+cañon
+casanier
+cølibat
+colon
+côlon
+COOP
+CO-OP
+coop
+co-op
+Copenhagen
+COTE
+cote
+CÔTE
+côte
+COTÉ
+coté
+CÔTÉ
+côté
+du
+dû
+élève
+élevé
+gène
+gêne
+gêné
+Größe
+Grossist
+haie
+haïe
+île
+Île d'Orléans
+lame
+l'âme
+lamé
+les
+LÈS
+lèse
+lésé
+L'Haÿ-les-Roses
+MÂCON
+maçon
+McArthur
+Mc Arthur
+Mc Mahon
+MODÈLE
+modelé
+NOËL
+Noël
+notre
+nôtre
+ode
+œil
+ou
+OÙ
+ovoïde
+pèche
+pêche
+PÉCHÉ
+péché
+pêché
+pécher
+pêcher
+pechère
+péchère
+relève
+relevé
+resume
+resumé
+résumé
+révèle
+révélé
+vice-president
+vice-président
+vice-president's offices
+vice-presidents' offices
+VICE-VERSA
+vice versa