[PATCH 11/36] locaedata: apply various fixes to French locales
From: Denis Barbier <bouzim@gmail.com>
Date: Fri, 8 Aug 2008 13:59:45 -0500
In particular, use a thousands separator.
I would say that thousand separator is U00A0 in French (at least for
fr_FR and fr_CA, not sure for other countries), but did not find
any official position. Here are some relevant links:
* in French:
http://www.olf.gouv.qc.ca/ressources/ti/dossiers/LangueMacOSX.pdf
http://frenchpro.free.fr/screen.pdf/ALIREscreen.pdf
* in English:
http://ftp.fdn.org/pub/CTAN/macros/latex/required/babel/frenchb.dtx
In French the decimal part starts with a comma and thousands
should be separated by a space; the same approximation of
$1000\pi$ should be inputed as |$3\;141{,}592\;653$| in math-mode
and as something like |3~141,592~653| in text
(this is self-documented LaTeX code, hence some markup is added.
Tilda is a non-breaking space and \; is a thin non-breaking space)
IMO mon_thousands_sep should also be changed from U0020 to U00A0.
Originally for glibc 2.3.6-1, 2006-01-05.
[bouzim@gmail.com, 2006-02-08: go back to ASCII space instead of
nonbreaking space to make libstdc++'s life easier; reported by Benoît
Dejean through http://bugs.debian.org/351786]
[bouzim@gmail.com, 2006-02-15: take LC_NUMERIC for fr_CH from de_CH]
[clint@debian.org, 2007-10-23: rebase against glibc 2.7]
[aurelien@aurel32.net, 2008-08-08: rebase against glibc 2.8]
Fixes: http://bugs.debian.org/248377
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
localedata/locales/fr_BE | 20 +++++++++++++++-----
localedata/locales/fr_CA | 15 ++++++++++-----
localedata/locales/fr_CH | 23 +++++++++++++++--------
localedata/locales/fr_FR | 21 ++++++++++++++++++---
localedata/locales/fr_LU | 23 ++++++++++++++++-------
5 files changed, 74 insertions(+), 28 deletions(-)
diff --git a/localedata/locales/fr_BE b/localedata/locales/fr_BE
index f9c911a..5abe6d7 100644
--- a/localedata/locales/fr_BE
+++ b/localedata/locales/fr_BE
@@ -42,6 +42,7 @@ category "fr_BE:2000";LC_PAPER
category "fr_BE:2000";LC_NAME
category "fr_BE:2000";LC_ADDRESS
category "fr_BE:2000";LC_TELEPHONE
+category "fr_BE:2000";LC_MEASUREMENT
END LC_IDENTIFICATION
@@ -117,9 +118,10 @@ d_fmt "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
t_fmt "<U0025><U0054>"
am_pm "";""
t_fmt_ampm ""
-date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
-<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
-<U0025><U005A><U0020><U0025><U0059>"
+date_fmt "<U0025><U0041><U0020><U0025><U002D><U0065><U0020>/
+<U0025><U0042><U0020><U0025><U0059><U002C><U0020>/
+<U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
+<U0028><U0055><U0054><U0043><U0025><U007A><U0029>"
week 7;19971130;4
first_weekday 2
@@ -146,8 +148,7 @@ measurement 1
END LC_MEASUREMENT
LC_NAME
-name_fmt "<U0025><U0064><U0025><U0074><U0025><U0067><U0025><U0074>/
-<U0025><U006D><U0025><U0074><U0025><U0066>"
+copy "fr_FR"
END LC_NAME
LC_ADDRESS
@@ -159,4 +160,13 @@ postal_fmt "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
country_ab2 "<U0042><U0045>"
country_ab3 "<U0042><U0045><U004C>"
country_num 056
+country_name "<U0042><U0065><U006C><U0067><U0069><U0071><U0075><U0065>"
+country_car "<U0042>"
+% FIXME
+country_post "<U0042><U0045>"
+country_isbn 2
+lang_name "<U0066><U0072><U0061><U006E><U00E7><U0061><U0069><U0073>"
+lang_ab "<U0066><U0072>"
+lang_term "<U0066><U0072><U0061>"
+lang_lib "<U0066><U0072><U0065>"
END LC_ADDRESS
diff --git a/localedata/locales/fr_CA b/localedata/locales/fr_CA
index 992a4b1..03bf9a8 100644
--- a/localedata/locales/fr_CA
+++ b/localedata/locales/fr_CA
@@ -43,6 +43,7 @@ category "fr_CA:2000";LC_PAPER
category "fr_CA:2000";LC_NAME
category "fr_CA:2000";LC_ADDRESS
category "fr_CA:2000";LC_TELEPHONE
+category "fr_CA:2000";LC_MEASUREMENT
END LC_IDENTIFICATION
@@ -118,9 +119,10 @@ d_fmt "<U0025><U0059><U002D><U0025><U006D><U002D><U0025><U0064>"
t_fmt "<U0025><U0054>"
am_pm "";""
t_fmt_ampm ""
-date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
-<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
-<U0025><U005A><U0020><U0025><U0059>"
+date_fmt "<U0025><U0041><U0020><U0025><U002D><U0065><U0020>/
+<U0025><U0042><U0020><U0025><U0059><U002C><U0020>/
+<U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
+<U0028><U0055><U0054><U0043><U0025><U007A><U0029>"
END LC_TIME
LC_PAPER
@@ -136,8 +138,7 @@ copy "en_CA"
END LC_MEASUREMENT
LC_NAME
-name_fmt "<U0025><U0064><U0025><U0074><U0025><U0067><U0025><U0074>/
-<U0025><U006D><U0025><U0074><U0025><U0066>"
+copy "fr_FR"
END LC_NAME
LC_ADDRESS
@@ -149,6 +150,10 @@ postal_fmt "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
country_ab2 "<U0043><U0041>"
country_ab3 "<U0043><U0041><U004E>"
country_num 124
+country_name "<U0043><U0061><U006E><U0061><U0064><U0061>"
+country_car "<U0043><U0044><U004E>"
+country_post "<U0043><U0041>"
+country_isbn 2
lang_name "<U0046><U0072><U0061><U006E><U00E7><U0061><U0069><U0073>"
lang_ab "<U0066><U0072>"
lang_term "<U0066><U0072><U0061>"
diff --git a/localedata/locales/fr_CH b/localedata/locales/fr_CH
index 7cb6282..a62eac2 100644
--- a/localedata/locales/fr_CH
+++ b/localedata/locales/fr_CH
@@ -43,6 +43,7 @@ category "fr_CH:2000";LC_PAPER
category "fr_CH:2000";LC_NAME
category "fr_CH:2000";LC_ADDRESS
category "fr_CH:2000";LC_TELEPHONE
+category "fr_CH:2000";LC_MEASUREMENT
END LC_IDENTIFICATION
@@ -64,9 +65,7 @@ copy "de_CH"
END LC_MONETARY
LC_NUMERIC
-decimal_point "<U002C>"
-thousands_sep ""
-grouping 0;0
+copy "de_CH"
END LC_NUMERIC
LC_TIME
@@ -104,9 +103,10 @@ d_fmt "<U0025><U0064><U002E><U0020><U0025><U006D><U002E><U0020><U0025><U0079>"
t_fmt "<U0025><U0054>"
am_pm "";""
t_fmt_ampm ""
-date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
-<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
-<U0025><U005A><U0020><U0025><U0059>"
+date_fmt "<U0025><U0041><U0020><U0025><U002D><U0065><U0020>/
+<U0025><U0042><U0020><U0025><U0059><U002C><U0020>/
+<U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
+<U0028><U0055><U0054><U0043><U0025><U007A><U0029>"
END LC_TIME
LC_PAPER
@@ -128,8 +128,7 @@ measurement 1
END LC_MEASUREMENT
LC_NAME
-name_fmt "<U0025><U0064><U0025><U0074><U0025><U0067><U0025><U0074>/
-<U0025><U006D><U0025><U0074><U0025><U0066>"
+copy "fr_FR"
END LC_NAME
LC_ADDRESS
@@ -141,4 +140,12 @@ postal_fmt "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
country_ab2 "<U0043><U0048>"
country_ab3 "<U0043><U0048><U0045>"
country_num 756
+country_name "<U0053><U0075><U0069><U0073><U0073><U0065>"
+country_car "<U0043><U0048>"
+country_post "<U0043><U0048>"
+country_isbn 2
+lang_name "<U0066><U0072><U0061><U006E><U00E7><U0061><U0069><U0073>"
+lang_ab "<U0066><U0072>"
+lang_term "<U0066><U0072><U0061>"
+lang_lib "<U0066><U0072><U0065>"
END LC_ADDRESS
diff --git a/localedata/locales/fr_FR b/localedata/locales/fr_FR
index dd54bcf..8b4c61c 100644
--- a/localedata/locales/fr_FR
+++ b/localedata/locales/fr_FR
@@ -44,6 +44,7 @@ category "fr_FR:2000";LC_PAPER
category "fr_FR:2000";LC_NAME
category "fr_FR:2000";LC_ADDRESS
category "fr_FR:2000";LC_TELEPHONE
+category "fr_FR:2000";LC_MEASUREMENT
END LC_IDENTIFICATION
@@ -137,9 +138,10 @@ d_fmt "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0059>"
t_fmt "<U0025><U0054>"
am_pm "";""
t_fmt_ampm ""
-date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
-<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
-<U0025><U005A><U0020><U0025><U0059>"
+date_fmt "<U0025><U0041><U0020><U0025><U002D><U0065><U0020>/
+<U0025><U0042><U0020><U0025><U0059><U002C><U0020>/
+<U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
+<U0028><U0055><U0054><U0043><U0025><U007A><U0029>"
week 7;19971130;4
first_weekday 2
@@ -166,6 +168,11 @@ END LC_MEASUREMENT
LC_NAME
name_fmt "<U0025><U0064><U0025><U0074><U0025><U0067><U0025><U0074>/
<U0025><U006D><U0025><U0074><U0025><U0066>"
+name_gen ""
+name_mr "<U004D><U002E>"
+name_mrs "<U004D><U006D><U0065>"
+name_miss "<U004D><U006C><U006C><U0065>"
+name_ms ""
END LC_NAME
LC_ADDRESS
@@ -177,4 +184,12 @@ postal_fmt "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
country_ab2 "<U0046><U0052>"
country_ab3 "<U0046><U0052><U0041>"
country_num 250
+country_name "<U0046><U0072><U0061><U006E><U0063><U0065>"
+country_car "<U0046>"
+country_post "<U0046><U0052>"
+country_isbn 2
+lang_name "<U0066><U0072><U0061><U006E><U00E7><U0061><U0069><U0073>"
+lang_ab "<U0066><U0072>"
+lang_term "<U0066><U0072><U0061>"
+lang_lib "<U0066><U0072><U0065>"
END LC_ADDRESS
diff --git a/localedata/locales/fr_LU b/localedata/locales/fr_LU
index 80b29b6..134bc7a 100644
--- a/localedata/locales/fr_LU
+++ b/localedata/locales/fr_LU
@@ -42,6 +42,7 @@ category "fr_LU:2000";LC_PAPER
category "fr_LU:2000";LC_NAME
category "fr_LU:2000";LC_ADDRESS
category "fr_LU:2000";LC_TELEPHONE
+category "fr_LU:2000";LC_MEASUREMENT
END LC_IDENTIFICATION
@@ -78,8 +79,8 @@ END LC_MONETARY
LC_NUMERIC
decimal_point "<U002C>"
-thousands_sep ""
-grouping 0;0
+thousands_sep "<U0020>"
+grouping 3;3
END LC_NUMERIC
LC_TIME
@@ -117,9 +118,10 @@ d_fmt "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0059>"
t_fmt "<U0025><U0054>"
am_pm "";""
t_fmt_ampm ""
-date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
-<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
-<U0025><U005A><U0020><U0025><U0059>"
+date_fmt "<U0025><U0041><U0020><U0025><U002D><U0065><U0020>/
+<U0025><U0042><U0020><U0025><U0059><U002C><U0020>/
+<U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
+<U0028><U0055><U0054><U0043><U0025><U007A><U0029>"
END LC_TIME
LC_PAPER
@@ -141,8 +143,7 @@ measurement 1
END LC_MEASUREMENT
LC_NAME
-name_fmt "<U0025><U0064><U0025><U0074><U0025><U0067><U0025><U0074>/
-<U0025><U006D><U0025><U0074><U0025><U0066>"
+copy "fr_FR"
END LC_NAME
LC_ADDRESS
@@ -154,4 +155,12 @@ postal_fmt "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
country_ab2 "<U004C><U0055>"
country_ab3 "<U004C><U0055><U0058>"
country_num 442
+country_name "<U004C><U0075><U0078><U0065><U006D><U0062><U006F><U0075><U0072><U0067>"
+country_car "<U004C>"
+country_post "<U004C><U0055>"
+country_isbn 2
+lang_name "<U0066><U0072><U0061><U006E><U00E7><U0061><U0069><U0073>"
+lang_ab "<U0066><U0072>"
+lang_term "<U0066><U0072><U0061>"
+lang_lib "<U0066><U0072><U0065>"
END LC_ADDRESS
--
1.7.5.1
Reply to: