From dd8c67b33fb3d422afebc83c70e51e736669b0ad Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 26 Apr 2006 20:18:18 +0000 Subject: Updated to fedora-glibc-20060426T2000 --- localedata/ChangeLog | 14 ++++++++++++++ localedata/Makefile | 4 +++- localedata/locales/bg_BG | 2 +- localedata/locales/bs_BA | 2 +- localedata/locales/es_MX | 2 +- localedata/locales/es_UY | 2 +- localedata/locales/ru_RU | 2 +- localedata/locales/tg_TJ | 2 +- localedata/locales/tt_RU | 2 +- localedata/tst-strfmon1.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 10 files changed, 66 insertions(+), 8 deletions(-) create mode 100644 localedata/tst-strfmon1.c (limited to 'localedata') diff --git a/localedata/ChangeLog b/localedata/ChangeLog index de23e123e3..addfec9c9d 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,17 @@ +2006-04-26 Ulrich Drepper + + * bg_BG: Update after iso-4217.def update. + * bs_BA: Likewise. + * es_MX: Likewise. + * ru_RU: Likewise. + * tg_TJ: Likewise. + * tt_RU: Likewise. + +2006-04-25 Ulrich Drepper + + [BZ #2376] + * locales/es_UY: Change curreny_symbol. + 2006-04-24 Ulrich Drepper [BZ #2349] diff --git a/localedata/Makefile b/localedata/Makefile index ed76a897d0..278cd71081 100644 --- a/localedata/Makefile +++ b/localedata/Makefile @@ -92,7 +92,8 @@ locale_test_suite := tst_iswalnum tst_iswalpha tst_iswcntrl \ tst_wctype tst_wcwidth tests = $(locale_test_suite) tst-digits tst-setlocale bug-iconv-trans \ - tst-leaks tst-mbswcs6 tst-xlocale1 tst-xlocale2 bug-usesetlocale + tst-leaks tst-mbswcs6 tst-xlocale1 tst-xlocale2 bug-usesetlocale \ + tst-strfmon1 ifeq (yes,$(build-shared)) ifneq (no,$(PERL)) tests: $(objpfx)mtrace-tst-leaks @@ -283,6 +284,7 @@ tst-digits-ENV = $(TEST_MBWC_ENV) tst-mbswcs6-ENV = $(TEST_MBWC_ENV) tst-xlocale1-ENV = $(TEST_MBWC_ENV) tst-xlocale2-ENV = $(TEST_MBWC_ENV) +tst-strfmon1-ENV = $(TEST_MBWC_ENV) tst-setlocale-ENV = LOCPATH=$(common-objpfx)localedata LC_ALL=ja_JP.EUC-JP diff --git a/localedata/locales/bg_BG b/localedata/locales/bg_BG index 2736174c4a..bb15588f84 100644 --- a/localedata/locales/bg_BG +++ b/localedata/locales/bg_BG @@ -155,7 +155,7 @@ reorder-end END LC_COLLATE LC_MONETARY -int_curr_symbol "" +int_curr_symbol "" currency_symbol "" mon_decimal_point "" mon_thousands_sep "" diff --git a/localedata/locales/bs_BA b/localedata/locales/bs_BA index 80cc49ffda..9d0a0e6376 100644 --- a/localedata/locales/bs_BA +++ b/localedata/locales/bs_BA @@ -149,7 +149,7 @@ noexpr "" END LC_MESSAGES LC_MONETARY -int_curr_symbol "" +int_curr_symbol "" currency_symbol "" mon_decimal_point "" mon_thousands_sep "" diff --git a/localedata/locales/es_MX b/localedata/locales/es_MX index 70e5ae7abb..d090008da6 100644 --- a/localedata/locales/es_MX +++ b/localedata/locales/es_MX @@ -61,7 +61,7 @@ noexpr "" END LC_MESSAGES LC_MONETARY -int_curr_symbol "" +int_curr_symbol "" currency_symbol "" mon_decimal_point "" mon_thousands_sep "" diff --git a/localedata/locales/es_UY b/localedata/locales/es_UY index 36d18b1af2..50f8019da2 100644 --- a/localedata/locales/es_UY +++ b/localedata/locales/es_UY @@ -62,7 +62,7 @@ END LC_MESSAGES LC_MONETARY int_curr_symbol "" -currency_symbol "" +currency_symbol "" mon_decimal_point "" mon_thousands_sep "" mon_grouping 3;3 diff --git a/localedata/locales/ru_RU b/localedata/locales/ru_RU index 2fdffb12cb..0308c5b79a 100644 --- a/localedata/locales/ru_RU +++ b/localedata/locales/ru_RU @@ -74,7 +74,7 @@ noexpr "" END LC_MESSAGES LC_MONETARY -int_curr_symbol "" +int_curr_symbol "" currency_symbol "" mon_decimal_point "" mon_thousands_sep "" diff --git a/localedata/locales/tg_TJ b/localedata/locales/tg_TJ index 3f9b58a1fb..5cd8422259 100644 --- a/localedata/locales/tg_TJ +++ b/localedata/locales/tg_TJ @@ -126,7 +126,7 @@ noexpr "" END LC_MESSAGES LC_MONETARY -int_curr_symbol "" +int_curr_symbol "" currency_symbol "" mon_decimal_point "" mon_thousands_sep "" diff --git a/localedata/locales/tt_RU b/localedata/locales/tt_RU index 31a3de1c2b..858cfb8f4f 100644 --- a/localedata/locales/tt_RU +++ b/localedata/locales/tt_RU @@ -227,7 +227,7 @@ noexpr "" END LC_MESSAGES LC_MONETARY -int_curr_symbol "" +int_curr_symbol "" currency_symbol "" mon_decimal_point "" mon_thousands_sep "" diff --git a/localedata/tst-strfmon1.c b/localedata/tst-strfmon1.c new file mode 100644 index 0000000000..e30aa1b204 --- /dev/null +++ b/localedata/tst-strfmon1.c @@ -0,0 +1,42 @@ +#include +#include +#include +#include + +static const struct +{ + const char *locale; + const char *expected; +} tests[] = + { + { "de_DE.ISO-8859-1", "|-12,34 EUR|-12,34|" }, + { "da_DK.ISO-8859-1", "|kr -12,34|-12,34|" }, + { "zh_TW.EUC-TW", "|-NT$12.34|-12.34|" }, + { "sv_SE.ISO-8859-1", "|-12,34 kr|-12,34|" } + }; +#define ntests (sizeof (tests) / sizeof (tests[0])) + + +static int +do_test (void) +{ + int res = 0; + for (int i = 0; i < ntests; ++i) + { + char buf[500]; + if (setlocale (LC_ALL, tests[i].locale) == NULL) + { + printf ("failed to set locale %s\n", tests[i].locale); + res = 1; + continue; + } + strfmon (buf, sizeof (buf), "|%n|%!n|", -12.34, -12.34); + int fail = strcmp (buf, tests[i].expected) != 0; + printf ("%s%s\n", buf, fail ? " *** FAIL ***" : ""); + res |= fail; + } + return res; +} + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" -- cgit v1.2.3-70-g09d2