diff options
-rw-r--r-- | localedata/ChangeLog | 5 | ||||
-rw-r--r-- | localedata/Makefile | 2 | ||||
-rw-r--r-- | localedata/tst-numeric.data | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 5bbc7f2774..808383b87d 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,8 @@ +2003-11-04 Ulrich Drepper <drepper@redhat.com> + + * tst-numeric.data: Fix fallout from nb_NO introduction. + * Makefile (LOCALES): Likewise. + 2003-11-03 Ulrich Drepper <drepper@redhat.com> * SUPPORTED (SUPPORTED-LOCALES): Rename no_NO to nb_NO. diff --git a/localedata/Makefile b/localedata/Makefile index 41495c24f6..6c3e5552a2 100644 --- a/localedata/Makefile +++ b/localedata/Makefile @@ -131,7 +131,7 @@ ifeq (no,$(cross-compiling)) LOCALES := de_DE.ISO-8859-1 de_DE.UTF-8 en_US.ANSI_X3.4-1968 \ en_US.ISO-8859-1 ja_JP.EUC-JP da_DK.ISO-8859-1 \ hr_HR.ISO-8859-2 sv_SE.ISO-8859-1 ja_JP.SJIS fr_FR.ISO-8859-1 \ - vi_VN.TCVN5712-1 no_NO.ISO-8859-1 nn_NO.ISO-8859-1 + vi_VN.TCVN5712-1 nb_NO.ISO-8859-1 nn_NO.ISO-8859-1 LOCALE_SRCS := $(shell echo "$(LOCALES)"|sed 's/\([^ .]*\)[^ ]*/\1/g') CHARMAPS := $(shell echo "$(LOCALES)" | \ sed -e 's/[^ .]*[.]\([^ ]*\)/\1/g' -e s/SJIS/SHIFT_JIS/g) diff --git a/localedata/tst-numeric.data b/localedata/tst-numeric.data index c586b68f93..37c90b04b9 100644 --- a/localedata/tst-numeric.data +++ b/localedata/tst-numeric.data @@ -43,7 +43,7 @@ C %9g -1.23 -1.23 # # check both the norwegian locales and snprintf with that data # -no_NO.ISO-8859-1 %'g 123.45 123,45 -no_NO.ISO-8859-1 %'g -123.45 -123,45 +nb_NO.ISO-8859-1 %'g 123.45 123,45 +nb_NO.ISO-8859-1 %'g -123.45 -123,45 nn_NO.ISO-8859-1 %'g 123.45 123,45 nn_NO.ISO-8859-1 %'g -123.45 -123,45 |