diff options
| author | Alexandre Oliva <aoliva@redhat.com> | 2017-11-28 16:23:02 +0100 |
|---|---|---|
| committer | Mike FABIAN <mfabian@redhat.com> | 2017-11-29 11:56:46 +0100 |
| commit | 8da25eec0aaf4d86a06088fff8d175989835e071 (patch) | |
| tree | b1ed2f0f98e9b3c3cbc3e728bb2e99b27d083fd4 /localedata/fr_FR.UTF-8.in | |
| parent | a55430cb0e261834ce7a4e118dd9e0f2b7fb14bc (diff) | |
| download | glibc-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_FR.UTF-8.in')
| -rw-r--r-- | localedata/fr_FR.UTF-8.in | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/localedata/fr_FR.UTF-8.in b/localedata/fr_FR.UTF-8.in index dd5c5330d5..070eb4dc0d 100644 --- a/localedata/fr_FR.UTF-8.in +++ b/localedata/fr_FR.UTF-8.in @@ -29,16 +29,16 @@ CO-OP Copenhagen cote COTE -côte -CÔTE coté COTÉ +côte +CÔTE côté CÔTÉ du dû -élève élevé +élève gène gêne gêné @@ -49,20 +49,20 @@ haïe île Île d'Orléans lame -l'âme lamé +l'âme les LÈS -lèse lésé +lèse L'Haÿ-les-Roses -MÂCON maçon +MÂCON McArthur Mc Arthur Mc Mahon -MODÈLE modelé +MODÈLE Noël NOËL notre @@ -72,22 +72,22 @@ ode ou OÙ ovoïde -pèche -pêche péché PÉCHÉ +pèche +pêche pêché pécher pêcher pechère péchère -relève relevé +relève resume resumé résumé -révèle révélé +révèle vice-president vice-président vice-president's offices |