From 298403f4b13275c56b219b450ce485d94d8e2d29 Mon Sep 17 00:00:00 2001
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Tue, 9 Jun 2009 22:22:04 +0000
Subject: [PATCH] Fix LC_NUMERIC and LC_MONETARY for de_CH locale

With the de_CH (swiss german) locale, numbers should look like this:

    numbers: 1'234.45
    monetary values: Fr. 1'234.45

Previously, the thousands separator was missing for numbers, and
"." for monetary values, and "," was incorrectly used as decimal
point.

PR:		conf/75502
Submitted by:	Benjamin Lutz <benlutz@datacomm.ch>
MFC after:	1 week
---
 share/monetdef/de_CH.ISO8859-1.src   |  4 ++--
 share/numericdef/Makefile            | 13 +++++++------
 share/numericdef/de_CH.ISO8859-1.src | 12 ++++++++++++
 3 files changed, 21 insertions(+), 8 deletions(-)
 create mode 100644 share/numericdef/de_CH.ISO8859-1.src

diff --git a/share/monetdef/de_CH.ISO8859-1.src b/share/monetdef/de_CH.ISO8859-1.src
index 9bb3e8e23cd4..d07e97ca7124 100644
--- a/share/monetdef/de_CH.ISO8859-1.src
+++ b/share/monetdef/de_CH.ISO8859-1.src
@@ -8,9 +8,9 @@ CHF
 # currency_symbol
 Fr.
 # mon_decimal_point
-,
-# mon_thousands_sep
 .
+# mon_thousands_sep
+'
 # mon_grouping, separated by ;
 3;3
 # positive_sign
diff --git a/share/numericdef/Makefile b/share/numericdef/Makefile
index 6f9124010f0d..0ac339cf755f 100644
--- a/share/numericdef/Makefile
+++ b/share/numericdef/Makefile
@@ -7,6 +7,7 @@ LOCALES=	af_ZA.ISO8859-1 \
 		ca_ES.ISO8859-1 \
 		cs_CZ.ISO8859-2 \
 		da_DK.ISO8859-1 \
+		de_CH.ISO8859-1 \
 		de_DE.ISO8859-1 \
 		el_GR.ISO8859-7 \
 		en_US.ISO8859-1 \
@@ -67,7 +68,7 @@ ENCODINGS=	ARMSCII-8 Big5 Big5HKSCS \
 		KOI8-R KOI8-U PT154 SJIS US-ASCII UTF-8
 
 BE_LINKS=	fr_BE:nl_BE
-DE_LINKS=	de_DE:de_AT de_DE:de_CH
+DE_LINKS=	de_DE:de_AT
 FR_LINKS=	fr_FR:fr_CA fr_FR:fr_CH
 GB_LINKS=	en_GB:en_AU en_GB:en_NZ
 IT_LINKS=	it_IT:it_CH
@@ -90,15 +91,15 @@ eucJP_SJIS=	ja_JP
 eucJP_UTF-8=	ja_JP
 eucKR_CP949=	ko_KR
 eucKR_UTF-8=	ko_KR
-ISO8859-1_ISO8859-15= af_ZA ca_ES da_DK de_DE en_US es_ES eu_ES fi_FI \
-		fr_BE fr_FR is_IS it_CH it_IT nl_NL no_NO pt_PT sv_SE \
-		${BE_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} \
+ISO8859-1_ISO8859-15= af_ZA ca_ES da_DK de_CH de_DE en_US es_ES eu_ES \
+		fi_FI fr_BE fr_FR is_IS it_CH it_IT nl_NL no_NO pt_PT \
+		sv_SE ${BE_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} \
 		${IT_LINKS} ${NO_LINKS} ${US_LINKS}
 ISO8859-1_ISO8859-1= ${BE_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} \
 		${IT_LINKS} ${NO_LINKS} ${US_LINKS}
 ISO8859-1_US-ASCII= en_US ${GB_LINKS} ${US_LINKS}
-ISO8859-1_UTF-8= af_ZA ca_ES da_DK de_DE en_US es_ES eu_ES fi_FI fr_BE \
-		fr_FR is_IS it_IT nl_NL no_NO pt_BR pt_PT sv_SE
+ISO8859-1_UTF-8= af_ZA ca_ES da_DK de_CH de_DE en_US es_ES eu_ES fi_FI \
+		fr_BE fr_FR is_IS it_IT nl_NL no_NO pt_BR pt_PT sv_SE
 ISO8859-2_UTF-8= cs_CZ hr_HR hu_HU pl_PL ro_RO sk_SK sl_SI
 ISO8859-5_UTF-8= sr_YU uk_UA
 ISO8859-5_CP1251= uk_UA
diff --git a/share/numericdef/de_CH.ISO8859-1.src b/share/numericdef/de_CH.ISO8859-1.src
new file mode 100644
index 000000000000..a25f9f9b8c18
--- /dev/null
+++ b/share/numericdef/de_CH.ISO8859-1.src
@@ -0,0 +1,12 @@
+# $FreeBSD$
+#
+# WARNING: spaces may be essential at the end of lines
+# WARNING: empty lines are essential too
+#
+# decimal_point
+.
+# thousands_sep
+'
+# grouping, separated by ;
+3;3
+# EOF