summaryrefslogtreecommitdiff
path: root/localedata
diff options
context:
space:
mode:
Diffstat (limited to 'localedata')
-rw-r--r--localedata/CHECKSUMS8
-rw-r--r--localedata/Makefile7
-rw-r--r--localedata/README12
-rw-r--r--localedata/fmon-de_DE.exp30
-rw-r--r--localedata/fmon-en_US.exp30
-rw-r--r--localedata/locales/cs_CZ112
-rw-r--r--localedata/sort-test.sh2
-rw-r--r--localedata/tst-fmon.c65
-rwxr-xr-xlocaledata/tst-fmon.sh32
9 files changed, 221 insertions, 77 deletions
diff --git a/localedata/CHECKSUMS b/localedata/CHECKSUMS
index 7c71e4ea7f..0c01ab21b3 100644
--- a/localedata/CHECKSUMS
+++ b/localedata/CHECKSUMS
@@ -156,6 +156,7 @@ db3c60025eb80244d70bf7889f058055 charmaps/T.101-G2
572baa84bd05d4b236b7e2fb211d0dfd charmaps/T.61-7BIT
1e39e36aa7544014059b0aa8381ab051 charmaps/T.61-8BIT
81c8e12a75dff4371ce82773d670cd6d charmaps/VIDEOTEX-SUPPL
+910e8174540ecba1ac61b5f27f6dc359 locales/cs_CZ
45ade09ead9fd385d58504bfc005ecab locales/da_DK
249894e0554d46d1fbdae4a5fb8cc20e locales/de_AT
b3628f73e00bb655a5e96bcc2331893c locales/de_BE
@@ -175,14 +176,13 @@ bda978c8b0e379d57a8599edfdb2e858 locales/fi_FI
a25300033ea6c619a4e15051f14aa65e locales/fo_FO
02ca55b19338f94530f0b60999638ed4 locales/fr_BE
655c7b8713b9aad20014df2c27928cb7 locales/fr_CA
-8e60885c3fda81bc7773f139657974f3 locales/fr_CA,2.13
-8a76a0e3ea2923367fdbab78a6bc67cb locales/fr_CA,2.13.orig
+d5bec15a74c4107a77a46fe185883574 locales/fr_CA,2.13
19403a5cd69a9ad658b173859eb022ef locales/fr_CH
48d8981b117e72c5eb2e9c181cbd7d2b locales/fr_FR
cc1b77cf4cdc4488a99637e730e0f57f locales/fr_LU
1987b72e766038b0f475165c994d1469 locales/ga_IE
be2ef06fd9a4b4def515216972fe9250 locales/gr_GR
-9e2de7fe4b41f9bad952cdc5bfd77cd4 locales/hr_HR
+e7ad1d62ccf958b04f018cbd96ede3b2 locales/hr_HR
7f35d03bbe29b53831674704f8b307af locales/hu_HU
1a8b95f6663b7a99703a32c6135d8896 locales/is_IS
47620dbc36bf3ffe04b32dd16b7aae3c locales/it_IT
@@ -194,7 +194,7 @@ d5394568c45886788becf67b54bc916e locales/lt_LT
e71081f29649cfd4ac8563ae1f7932fa locales/nl_NL
3a0720088defd80baa0623990c6d196a locales/no_NO
6d1bb18d4271cd712e5dc24eec4706b9 locales/pl_PL
-b07ce7e57dda4687f2a83cd5ec79a3e0 locales/POSIX
+bbbcbd6f0a484ec25d8a592217a76ebb locales/POSIX
509fc74fdd394f6876358d357f955645 locales/pt_BR
7c2463bcee68bccde3145642a34a8ef1 locales/pt_PT
32c766f85eb82823856485e5802dce19 locales/ro_RO
diff --git a/localedata/Makefile b/localedata/Makefile
index 17dd43c8d2..87f8cbaceb 100644
--- a/localedata/Makefile
+++ b/localedata/Makefile
@@ -30,9 +30,9 @@ charmaps := $(filter-out $(addprefix charmaps/, CVS RCS %~), \
locales := $(filter-out $(addprefix locales/, CVS RCS %~), \
$(wildcard locales/*))
-test-srcs := collate-test xfrm-test
+test-srcs := collate-test xfrm-test tst-fmon
test-input := de_DE.ISO-8859-1 da_DK.ISO-8859-1 fr_CA,2.13.ISO-8859-1
-
+fmon-input := de_DE.ISO-8859-1 en_US.ISO-8859-1
# Get $(inst_i18ndir) defined.
include ../Makeconfig
@@ -48,6 +48,7 @@ $(inst_i18ndir)/locales/%: locales/%; $(do-install)
ifeq (no,$(cross-compiling))
-tests: $(objpfx)collate-test $(objpfx)xfrm-test
+tests: $(objpfx)collate-test $(objpfx)xfrm-test $(objpfx)tst-fmon
$(SHELL) -e sort-test.sh $(common-objpfx) $(test-input)
+ $(SHELL) -e tst-fmon.sh $(common-objpfx) $(fmon-input)
endif
diff --git a/localedata/README b/localedata/README
index efd375d3e2..3ef75539c1 100644
--- a/localedata/README
+++ b/localedata/README
@@ -2,7 +2,7 @@
and
POSIX character set descriptions
-Ulrich Drepper Time-stamp: <1997/02/12 22:13:01 drepper>
+Ulrich Drepper Time-stamp: <1997/06/04 01:36:26 drepper>
drepper@cygnus.com
@@ -34,10 +34,10 @@ desired data should happen like this:
localedef -i fr_CA -f ISO-8859-1 fr_CA
This will place the 6 output files in the appropriate directory where
-the GNU libc functions can find them. Please note that you need the
-rights to write to this directory ($(prefix)/share/locale, where
+the GNU libc functions can find them. Please note that you need
+permission to write to this directory ($(prefix)/share/locale, where
$(prefix) is the value you specified while configuring GNU libc). If
-you do not have the necessary rights, you can write the files into an
+you do not have the necessary permissions, you can write the files into an
arbitrary directory by giving a path including a '/' character instead
of `fr_CA'. E.g., to put the new files in a subdirectory of the
current directory simply use
@@ -48,7 +48,7 @@ How to use these data files is described in the GNU libc manual,
especially in the section describing the `setlocale' function.
-The here contained files can originally be found at
+The files contained here were originally from
ftp://dkuug.dk/i18n/WG15-collection
@@ -60,7 +60,7 @@ data or want to add something please contact
and
Ulrich Drepper <drepper@cygnus.com>
-Please make sure your corrections are relativ to the originally
+Please make sure your corrections are relative to the originally
distributed files. Consult the CHECKSUMS file which contains the MD5
sums for all data files.
diff --git a/localedata/fmon-de_DE.exp b/localedata/fmon-de_DE.exp
new file mode 100644
index 0000000000..77cb9dd0df
--- /dev/null
+++ b/localedata/fmon-de_DE.exp
@@ -0,0 +1,30 @@
+" DM123,45"
+"-DM123,45"
+" DM3.456,78"
+" DM123,45"
+" -DM123,45"
+" DM3.456,78"
+" DM 123,45"
+"-DM 123,45"
+" DM 3.456,78"
+" DM***123,45"
+"-DM***123,45"
+" DM*3.456,78"
+" DM000123,45"
+"-DM000123,45"
+" DM03.456,78"
+" DM 123,45"
+"-DM 123,45"
+" DM 3456,78"
+" DM 123"
+"-DM 123"
+" DM 3457"
+" DM 123,4500"
+"-DM 123,4500"
+" DM 3456,7810"
+" DM 123,45 "
+"(DM 123,45)"
+" DM 3.456,78 "
+" 123,45 "
+"( 123,45)"
+" 3.456,78 "
diff --git a/localedata/fmon-en_US.exp b/localedata/fmon-en_US.exp
new file mode 100644
index 0000000000..a740c7257f
--- /dev/null
+++ b/localedata/fmon-en_US.exp
@@ -0,0 +1,30 @@
+" $123.45"
+"-$123.45"
+" $3,456.78"
+" $123.45"
+" -$123.45"
+" $3,456.78"
+" $ 123.45"
+"-$ 123.45"
+" $ 3,456.78"
+" $***123.45"
+"-$***123.45"
+" $*3,456.78"
+" $000123.45"
+"-$000123.45"
+" $03,456.78"
+" $ 123.45"
+"-$ 123.45"
+" $ 3456.78"
+" $ 123"
+"-$ 123"
+" $ 3457"
+" $ 123.4500"
+"-$ 123.4500"
+" $ 3456.7810"
+" $ 123.45 "
+"($ 123.45)"
+" $ 3,456.78 "
+" 123.45 "
+"( 123.45)"
+" 3,456.78 "
diff --git a/localedata/locales/cs_CZ b/localedata/locales/cs_CZ
index ba159570d8..6713adc6d2 100644
--- a/localedata/locales/cs_CZ
+++ b/localedata/locales/cs_CZ
@@ -2,9 +2,9 @@ escape_char /
comment_char %
%
% Czech Language Locale for Czech
-% Source:
-% Address: U školy 292 Without diactitical chars: U skoly 292
-% 783 72 Velký Týnec 782 72 Velky Tynec
+% Source:
+% Address: U školy 292 Without diactitical chars: U skoly 292
+% 783 72 Velký Týnec 782 72 Velky Tynec
% Contact: Vladimir Michl
% Email: Vladimir.Michl@upol.cz
% Tel:
@@ -19,13 +19,15 @@ comment_char %
% Charset: ISO_8859-2:1987
% Distribution and use is free, also
% for commercial purposes.
+% 1997-08-20: Michael Mráka <michael@fi.muni.cz>
+% Změny zejména v sekci LC_TIME. (Changes especially in LC_TIME section.)
+
% zpracování:
%% localedef -c -i <tento-soubor> -f "ISO_8859-2:1987" 'cs_CZ.ISO-8859-2'
%% pokud se podaří odstranit chyby, lze -c vynechat.
-%% pro úspěšné přeložení je třeba mít kolekci lokalizací WG15collection.
-%% Tuto rozbalit do adresáře
+%% pro úspěšné přeložení je třeba mít kolekci lokalizací WG15collection. Tuto rozbalit do adresáře
%% /usr/share/i18n
%% Lokalizace se pak budou tvořit v adresáři /usr/share/locale
@@ -42,9 +44,9 @@ comment_char %
LC_COLLATE
% Definice písmene ch
-collating-element <c-h> from "<c><h>"
-collating-element <C-h> from "<C><h>"
-collating-element <C-H> from "<C><H>"
+collating-element <ch> from "<c><h>"
+collating-element <Ch> from "<C><h>"
+collating-element <CH> from "<C><H>"
collating-symbol <CAPITAL>
collating-symbol <SMALL>
@@ -65,11 +67,10 @@ collating-symbol <STROKE>
collating-symbol <CEDILLA>
collating-symbol <OGONEK>
-order_start forward;backward/
- ;forward;position
+order_start forward;forward;forward;forward
-<CAPITAL>
<SMALL>
+<CAPITAL>
<NONE>
<ACUTE>
@@ -87,7 +88,7 @@ order_start forward;backward/
<CEDILLA>
<OGONEK>
-%
+%
<NS> <NS>;<NS>;<NS>;IGNORE
<SP> IGNORE;IGNORE;IGNORE;<SP>
<HT> IGNORE;IGNORE;IGNORE;<HT>
@@ -202,8 +203,8 @@ order_start forward;backward/
<OC> IGNORE;IGNORE;IGNORE;<OC>
<PM> IGNORE;IGNORE;IGNORE;<PM>
<AC> IGNORE;IGNORE;IGNORE;<AC>
-UNDEFINED IGNORE;IGNORE;IGNORE
-
+UNDEFINED IGNORE;IGNORE;IGNORE;IGNORE
+
<0> <0>;<0>;IGNORE;IGNORE
<1> <1>;<1>;IGNORE;IGNORE
<2> <2>;<2>;IGNORE;IGNORE
@@ -267,9 +268,9 @@ UNDEFINED IGNORE;IGNORE;IGNORE
<H> <H>;<NONE>;<CAPITAL>;IGNORE
<h> <H>;<NONE>;<SMALL>;IGNORE
-<C-H> <C-H>;<NONE>;<CAPITAL>;IGNORE
-<C-h> <C-h>;<NONE>;<CAPITAL>;IGNORE
-<c-h> <c-h>;<NONE>;<SMALL>;IGNORE
+<CH> <CH>;<NONE>;<CAPITAL>;IGNORE
+<Ch> <Ch>;<NONE>;<CAPITAL>;IGNORE
+<ch> <ch>;<NONE>;<SMALL>;IGNORE
<I> <I>;<NONE>;<CAPITAL>;IGNORE
<i> <I>;<NONE>;<SMALL>;IGNORE
@@ -385,13 +386,10 @@ END LC_COLLATE
LC_CTYPE
-digit <0>;<1>;<2>;<3>;<4>;/
- <5>;<6>;<7>;<8>;<9>
+digit <0>;<1>;<2>;<3>;<4>;<5>;<6>;<7>;<8>;<9>
-xdigit <0>;<1>;<2>;<3>;<4>;/
- <5>;<6>;<7>;<8>;<9>;/
- <a>;...;<f>;/
- <A>;...;<F>
+xdigit <0>;<1>;<2>;<3>;<4>;<5>;<6>;<7>;<8>;<9>;/
+ <a>;...;<f>;<A>;...;<F>
punct <!>;...;<//>;/
<:>;...;<At>;/
@@ -406,7 +404,7 @@ blank <SP>;<HT>;<NS>
space <SP>;<LF>;<VT>;<FF>;/
<CR>;<HT>;<NS>
-
+
cntrl <NU>;<SH>;<SX>;<EX>;<ET>;<EQ>;/
<AK>;<BL>;<BS>;<HT>;<LF>;<VT>;/
<FF>;<CR>;<SO>;<SI>;<DL>;<D1>;/
@@ -419,7 +417,8 @@ cntrl <NU>;<SH>;<SX>;<EX>;<ET>;<EQ>;/
<MW>;<SG>;<EG>;<SS>;<GC>;<SC>;/
<CI>;<ST>;<OC>;<PM>;<AC>
-alpha <A>;...;<Z>;/
+
+upper <A>;...;<Z>;/
<A;>;/
<L//>;/
<L<>;/
@@ -459,8 +458,9 @@ alpha <A>;...;<Z>;/
<U">;/
<U:>;/
<Y'>;/
- <T,>;/
- <a>;...;<z>;/
+ <T,>
+
+lower <a>;...;<z>;/
<a;>;/
<l//>;/
<l<>;/
@@ -503,7 +503,7 @@ alpha <A>;...;<Z>;/
<y'>;/
<t,>
-upper <A>;...;<Z>;/
+alpha <A>;...;<Z>;/
<A;>;/
<L//>;/
<L<>;/
@@ -543,9 +543,8 @@ upper <A>;...;<Z>;/
<U">;/
<U:>;/
<Y'>;/
- <T,>
-
-lower <a>;...;<z>;/
+ <T,>;/
+ <a>;...;<z>;/
<a;>;/
<l//>;/
<l<>;/
@@ -588,7 +587,6 @@ lower <a>;...;<z>;/
<y'>;/
<t,>
-
toupper (<a>,<A>);(<b>,<B>);(<c>,<C>);(<d>,<D>);(<e>,<E>);(<f>,<F>);/
(<g>,<G>);(<h>,<H>);(<i>,<I>);(<j>,<J>);(<k>,<K>);(<l>,<L>);/
(<m>,<M>);(<n>,<N>);(<o>,<O>);(<p>,<P>);(<q>,<Q>);(<r>,<R>);/
@@ -687,7 +685,7 @@ END LC_CTYPE
%% ekvivalenty yes/no
%% -------------------------
-LC_MESSAGES
+LC_MESSAGES
yesexpr "<<(><a><A><y><Y><)/>><.><*>"
noexpr "<<(><n><N><)/>><.><*>"
@@ -734,6 +732,7 @@ END LC_NUMERIC
LC_TIME
+
abday "<N><e>";/
"<P><o>";/
"<U'><t>";/
@@ -750,18 +749,22 @@ day "<N><e><d><e<><l><e>";/
"<P><a'><t><e><k>";/
"<S><o><b><o><t><a>"
-abmon "<L><e><d>";/
- "<U'><n><o>";/
- "<B><r<><e>";/
- "<D><u><b>";/
- "<K><v><e<>";/
- "<C<><e><r>";/
- "<C<><n><c>";/
- "<S><r><p>";/
- "<Z><a'><r<>";/
- "<R<><i'><j>";/
- "<L><i><s>";/
- "<P><r><o>"
+%abmon "<L><e><d>";"<U'><n><o>";"<B><r<><e>";"<D><u><b>";"<K><v><e<>";/
+% "<C<><e><r>";"<C<><n><c>";"<S><r><p>";"<Z><a'><r<>";"<R<><i'><j>";/
+% "<L><i><s>";"<P><r><o>"
+% Obávám se, že čeština žádné zkratky pro měsíce nezná :-)
+abmon "<L><e><d><e><n>";/
+ "<U'><n><o><r>";/
+ "<B><r<><e><z><e><n>";/
+ "<D><u><b><e><n>";/
+ "<K><v><e<><t><e><n>";/
+ "<C<><e><r><v><e><n>";/
+ "<C<><e><r><v><e><n><e><c>";/
+ "<S><r><p><e><n>";/
+ "<Z><a'><r<><i'>";/
+ "<R<><i'><j><e><n>";/
+ "<L><i><s><t><o><p><a><d>";/
+ "<P><r><o><s><i><n><e><c>"
mon "<L><e><d><e><n>";/
"<U'><n><o><r>";/
@@ -777,33 +780,16 @@ mon "<L><e><d><e><n>";/
"<P><r><o><s><i><n><e><c>"
-d_t_fmt "<%><a><SP><%><d><.><SP><%><B><SP><%><Y><SP><%><H><:><%><M><:><%><S><SP><%><Z>"
-%d_t_fmt "<%><d><.><%><m><.><%><Y><SP><%><T><SP><%><Z>"
+d_t_fmt "<%><a><SP><%><e><.><SP><%><B><SP><%><Y><,><SP><%><H><:><%><M><:><%><S><SP><%><Z>"
d_fmt "<%><d><.><%><m><.><%><Y>"
-%d_fmt "<%><d><.><%><m><.><%><Y>"
t_fmt "<%><H><:><%><M><:><%><S>"
-%t_fmt "<%><T>"
t_fmt_ampm "<%><I><:><%><M><:><%><S>"
-%t_fmt_ampm ""
-%am_pm "am";"pm"
am_pm "";""
-% Zde nevím, co následující položky znamenají
-% V případě potřeby prosím opravte
-
-%era "<%><Y>"
-
-%era_year "<%><y>"
-
-%alt_digits "<0>";"<1>";"<2>";"<3>";"<4>";/
-% "<5>";"<6>";"<7>";"<8>"
-
-%era_d_fmt "<%><e><SP><%><B><SP><%><Y>"
-
END LC_TIME
%% END OF LOCALIZATION FILE for cs_CZ.ISO-8859-2
diff --git a/localedata/sort-test.sh b/localedata/sort-test.sh
index 8197ac09eb..8f9bb55b72 100644
--- a/localedata/sort-test.sh
+++ b/localedata/sort-test.sh
@@ -35,5 +35,5 @@ done
exit $status
# Local Variables:
-# mode:ksh
+# mode:shell-script
# End:
diff --git a/localedata/tst-fmon.c b/localedata/tst-fmon.c
new file mode 100644
index 0000000000..4b7146996e
--- /dev/null
+++ b/localedata/tst-fmon.c
@@ -0,0 +1,65 @@
+#include <monetary.h>
+#include <stdio.h>
+#include <locale.h>
+
+static int
+check (const char *fmt, double n)
+{
+ int result;
+ char buf[1000];
+
+ result = strfmon (buf, sizeof buf, fmt, n) == -1;
+
+ printf ("\"%s\"\n", buf);
+ return result;
+}
+
+int
+main (void)
+{
+ int result = 0;
+
+ setlocale (LC_ALL, "");
+
+ result |= check ("%n", 123.45);
+ result |= check ("%n", -123.45);
+ result |= check ("%n", 3456.781);
+
+ result |= check ("%11n", 123.45);
+ result |= check ("%11n", -123.45);
+ result |= check ("%11n", 3456.781);
+
+ result |= check ("%#5n", 123.45);
+ result |= check ("%#5n", -123.45);
+ result |= check ("%#5n", 3456.781);
+
+ result |= check ("%=*#5n", 123.45);
+ result |= check ("%=*#5n", -123.45);
+ result |= check ("%=*#5n", 3456.781);
+
+ result |= check ("%=0#5n", 123.45);
+ result |= check ("%=0#5n", -123.45);
+ result |= check ("%=0#5n", 3456.781);
+
+ result |= check ("%^#5n", 123.45);
+ result |= check ("%^#5n", -123.45);
+ result |= check ("%^#5n", 3456.781);
+
+ result |= check ("%^#5.0n", 123.45);
+ result |= check ("%^#5.0n", -123.45);
+ result |= check ("%^#5.0n", 3456.781);
+
+ result |= check ("%^#5.4n", 123.45);
+ result |= check ("%^#5.4n", -123.45);
+ result |= check ("%^#5.4n", 3456.781);
+
+ result |= check ("%(#5n", 123.45);
+ result |= check ("%(#5n", -123.45);
+ result |= check ("%(#5n", 3456.781);
+
+ result |= check ("%!(#5n", 123.45);
+ result |= check ("%!(#5n", -123.45);
+ result |= check ("%!(#5n", 3456.781);
+
+ return result;
+}
diff --git a/localedata/tst-fmon.sh b/localedata/tst-fmon.sh
new file mode 100755
index 0000000000..cac9917ff5
--- /dev/null
+++ b/localedata/tst-fmon.sh
@@ -0,0 +1,32 @@
+#! /bin/sh
+
+common_objpfx=$1; shift
+lang=$*
+
+here=`pwd`
+
+# Generate data files.
+for l in $lang; do
+ cns=`echo $l | sed 's/\(.*\)[.][^.]*/\1/'`
+ cn=locales/$cns
+ fn=charmaps/`echo $l | sed 's/.*[.]\([^.]*\)/\1/'`
+ LD_LIBRARY_PATH=$common_objpfx I18NPATH=./locales ${common_objpfx}elf/ld.so \
+ ${common_objpfx}locale/localedef --quiet -i $cn -f $fn \
+ ${common_objpfx}localedata/$cns
+done
+
+# Run the tests.
+for l in $lang; do
+ cns=`echo $l | sed 's/\(.*\)[.][^.]*/\1/'`
+
+ LOCPATH=$common_objpfx/localedata LC_ALL=$cns \
+ LD_LIBRARY_PATH=$common_objpfx $common_objpfx/elf/ld.so \
+ $common_objpfx/localedata/tst-fmon \
+ > $common_objpfx/localedata/fmon-$cns.out || status=1
+ cmp -s fmon-$cns.exp $common_objpfx/localedata/fmon-$cns.out || status=1
+done
+
+exit $status
+# Local Variables:
+# mode:shell-script
+# End:
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-01 00:01:08 +0000