diff options
Diffstat (limited to 'libc/localedata')
| -rw-r--r-- | libc/localedata/ChangeLog | 10 | ||||
| -rw-r--r-- | libc/localedata/locales/fi_FI@euro | 6 | ||||
| -rwxr-xr-x | libc/localedata/tst-langinfo.sh | 5 |
3 files changed, 15 insertions, 6 deletions
diff --git a/libc/localedata/ChangeLog b/libc/localedata/ChangeLog index 3e775ed44..1b36e0235 100644 --- a/libc/localedata/ChangeLog +++ b/libc/localedata/ChangeLog @@ -1,3 +1,13 @@ +2012-11-02 Marko Myllynen <myllynen@redhat.com> + + [BZ #14669] + * locales/fi_FI@euro (LC_IDENTIFICATION): Add missing + LC_MEASUREMENT, fix LC_TELEPHONE category. + +2012-10-31 Joseph Myers <joseph@codesourcery.com> + + * Makefile [$(run-built-tests) = yes] (LOCALES): Add en_US.UTF-8. + 2012-10-23 Joseph Myers <joseph@codesourcery.com> * Makefile [$(cross-compiling) = no]: Change condition to diff --git a/libc/localedata/locales/fi_FI@euro b/libc/localedata/locales/fi_FI@euro index 39c51d64d..8c610ccc6 100644 --- a/libc/localedata/locales/fi_FI@euro +++ b/libc/localedata/locales/fi_FI@euro @@ -1,4 +1,4 @@ -escape_char / +escape_char / comment_char % % Finnish language locale for Finland with Euro @@ -33,10 +33,10 @@ category "fi_FI@euro:2000";LC_NUMERIC category "fi_FI@euro:2000";LC_MONETARY category "fi_FI@euro:2000";LC_MESSAGES category "fi_FI@euro:2000";LC_PAPER +category "fi_FI@euro:2000";LC_MEASUREMENT category "fi_FI@euro:2000";LC_NAME category "fi_FI@euro:2000";LC_ADDRESS -category "fi_FI:2000";LC_TELEPHONE - +category "fi_FI@euro:2000";LC_TELEPHONE END LC_IDENTIFICATION LC_COLLATE diff --git a/libc/localedata/tst-langinfo.sh b/libc/localedata/tst-langinfo.sh index 04771cb02..8d4671736 100755 --- a/libc/localedata/tst-langinfo.sh +++ b/libc/localedata/tst-langinfo.sh @@ -20,7 +20,7 @@ set -e common_objpfx=$1 -run_program_prefix=$2 +tst_langinfo=$2 # Run the test program. cat <<"EOF" | @@ -340,8 +340,7 @@ ja_JP.EUC-JP NOEXPR ^([nNｎＮ]|いいえ|イイエ) ja_JP.EUC-JP CODESET EUC-JP EOF LOCPATH=${common_objpfx}localedata GCONV_PATH=${common_objpfx}iconvdata \ -LC_ALL=tt_TT ${run_program_prefix} \ - ${common_objpfx}localedata/tst-langinfo \ +LC_ALL=tt_TT ${tst_langinfo} \ > ${common_objpfx}localedata/tst-langinfo.out exit $? |