[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[patch] Correct locales for Norway
FreeBSD currently only has no_NO, instead of nb_NO and nn_NO (with
no_NO as an alias for nb_NO). The attached attempts to correct this,
but doesn't do it very well.
Here's how it should be done:
- no_NO should be repocopied to nb_NO.
- no_NO should have its files removed and become an alias for nb_NO
in all cases.
- nn_NO should be an alias for nb_NO in all cases excpet LC_TIME, for
which correct definitions are included in the patch.
I'd be very grateful if someone sufficiently familiar with our locale
system could take the time to do this properly.
DES
--
Dag-Erling Smørgrav - des@xxxxxx
Index: etc/mtree/BSD.local.dist
===================================================================
RCS file: /home/ncvs/src/etc/mtree/BSD.local.dist,v
retrieving revision 1.117
diff -u -r1.117 BSD.local.dist
--- etc/mtree/BSD.local.dist 10 Jun 2005 20:14:38 -0000 1.117
+++ etc/mtree/BSD.local.dist 27 Oct 2005 11:21:35 -0000
@@ -725,6 +725,12 @@
..
lt_LT.UTF-8
..
+ nb_NO.ISO8859-1
+ ..
+ nb_NO.ISO8859-15
+ ..
+ nb_NO.UTF-8
+ ..
nl_BE.ISO8859-1
..
nl_BE.ISO8859-15
@@ -737,6 +743,12 @@
..
nl_NL.UTF-8
..
+ nn_NO.ISO8859-1
+ ..
+ nn_NO.ISO8859-15
+ ..
+ nn_NO.UTF-8
+ ..
no_NO.ISO8859-1
..
no_NO.ISO8859-15
Index: etc/mtree/BSD.usr.dist
===================================================================
RCS file: /home/ncvs/src/etc/mtree/BSD.usr.dist,v
retrieving revision 1.312
diff -u -r1.312 BSD.usr.dist
--- etc/mtree/BSD.usr.dist 4 Mar 2005 14:24:30 -0000 1.312
+++ etc/mtree/BSD.usr.dist 27 Oct 2005 11:21:25 -0000
@@ -543,6 +543,12 @@
..
lt_LT.UTF-8
..
+ nb_NO.ISO8859-1
+ ..
+ nb_NO.ISO8859-15
+ ..
+ nb_NO.UTF-8
+ ..
nl_BE.ISO8859-1
..
nl_BE.ISO8859-15
@@ -555,6 +561,12 @@
..
nl_NL.UTF-8
..
+ nn_NO.ISO8859-1
+ ..
+ nn_NO.ISO8859-15
+ ..
+ nn_NO.UTF-8
+ ..
no_NO.ISO8859-1
..
no_NO.ISO8859-15
Index: share/colldef/Makefile
===================================================================
RCS file: /home/ncvs/src/share/colldef/Makefile,v
retrieving revision 1.69
diff -u -r1.69 Makefile
--- share/colldef/Makefile 4 Mar 2005 14:24:29 -0000 1.69
+++ share/colldef/Makefile 27 Oct 2005 11:04:37 -0000
@@ -64,8 +64,8 @@
ISO8859-1_ISO8859-1= ${ISO8859-15_ISO8859-15} pt_PT:pt_BR
LATIN1LINKS= af_ZA da_DK en_AU en_CA en_GB en_NZ en_US eu_ES fi_FI \
- fr_BE fr_CA fr_CH fr_FR it_CH it_IT nl_BE nl_NL no_NO \
- pt_PT
+ fr_BE fr_CA fr_CH fr_FR it_CH it_IT nb_NO nl_BE nl_NL \
+ nn_NO no_NO pt_PT
ISO8859-15_ISO8859-15= de_DE:de_AT de_DE:de_CH ${LATIN1LINKS:C/^/la_LN:/}
LATIN2LINKS= hr_HR hu_HU ro_RO sr_YU
@@ -89,9 +89,9 @@
de_DE el_GR en_AU en_CA en_GB en_IE en_NZ en_US es_ES \
et_EE eu_ES fi_FI fr_BE \
fr_CA fr_CH fr_FR he_IL hr_HR hu_HU hy_AM is_IS it_CH it_IT \
- ja_JP kk_KZ ko_KR lt_LT nl_BE nl_NL no_NO pl_PL pt_BR pt_PT \
- ro_RO ru_RU sk_SK sl_SI sr_YU sv_SE tr_TR uk_UA zh_CN zh_HK \
- zh_TW
+ ja_JP kk_KZ ko_KR lt_LT nb_NO nl_BE nl_NL nn_NO no_NO pl_PL \
+ pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI sr_YU sv_SE tr_TR uk_UA \
+ zh_CN zh_HK zh_TW
US-ASCII_UTF-8= ${UTF8LINKS:C/^/la_LN:/}
SYMLINKS=
Index: share/mklocale/Makefile
===================================================================
RCS file: /home/ncvs/src/share/mklocale/Makefile,v
retrieving revision 1.63
diff -u -r1.63 Makefile
--- share/mklocale/Makefile 4 Mar 2005 14:24:29 -0000 1.63
+++ share/mklocale/Makefile 27 Oct 2005 11:15:17 -0000
@@ -53,8 +53,7 @@
LATIN1XLINKS= af_ZA ca_ES da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_NZ \
en_US es_ES eu_ES fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH \
- it_IT \
- nl_BE nl_NL no_NO pt_PT sv_SE
+ it_IT nb_NO nl_BE nl_NL nn_NO no_NO pt_PT sv_SE
LATIN1LINKS= ${LATIN1XLINKS} pt_BR
ISO8859-1_ISO8859-1= ${LATIN1LINKS:C/^/la_LN:/}
@@ -75,11 +74,10 @@
UTF8LINKS= af_ZA be_BY bg_BG ca_ES cs_CZ da_DK de_AT de_CH de_DE el_GR \
en_AU en_CA en_GB en_IE en_NZ en_US es_ES et_EE eu_ES fi_FI \
- fr_BE \
- fr_CA fr_CH fr_FR he_IL hr_HR hu_HU hy_AM is_IS it_CH it_IT \
- ja_JP kk_KZ ko_KR lt_LT nl_BE nl_NL no_NO pl_PL pt_BR pt_PT \
- ro_RO ru_RU sk_SK sl_SI sr_YU sv_SE tr_TR uk_UA zh_CN zh_HK \
- zh_TW
+ fr_BE fr_CA fr_CH fr_FR he_IL hr_HR hu_HU hy_AM is_IS it_CH \
+ it_IT ja_JP kk_KZ ko_KR lt_LT nb_NO nl_BE nl_NL nn_NO no_NO \
+ pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI sr_YU sv_SE tr_TR \
+ uk_UA zh_CN zh_HK zh_TW
UTF-8_UTF-8= ${UTF8LINKS:C/^/:/}
US-ASCII_ISO8859-9= la_LN:tr_TR
Index: share/monetdef/Makefile
===================================================================
RCS file: /home/ncvs/src/share/monetdef/Makefile,v
retrieving revision 1.62
diff -u -r1.62 Makefile
--- share/monetdef/Makefile 4 Mar 2005 14:24:29 -0000 1.62
+++ share/monetdef/Makefile 27 Oct 2005 11:01:32 -0000
@@ -99,14 +99,14 @@
eucJP_SJIS= ja_JP
eucKR_CP949= ko_KR
GB2312_GBK= zh_CN
-ISO8859-1_ISO8859-1= es_ES:eu_ES de_CH:fr_CH de_CH:it_CH
+ISO8859-1_ISO8859-1= es_ES:eu_ES de_CH:fr_CH de_CH:it_CH no_NO:nb_NO no_NO:nn_NO
ISO8859-1_ISO8859-15= af_ZA ca_ES da_DK de_AT de_CH de_DE en_AU en_CA \
en_GB en_NZ en_US es_ES fi_FI fr_BE fr_CA fr_CH fr_FR \
- is_IS it_IT it_CH nl_BE nl_NL no_NO pt_PT sv_SE
+ is_IS it_IT it_CH nl_BE nl_NL nb_NO nn_NO no_NO pt_PT sv_SE
ISO8859-1_US-ASCII= en_AU en_CA en_GB en_NZ en_US
ISO8859-1_UTF-8= af_ZA ca_ES da_DK de_AT de_CH de_DE en_AU en_CA en_NZ \
en_US es_ES fi_FI fr_BE fr_CA fr_FR is_IS it_IT nl_BE \
- nl_NL no_NO pt_BR pt_PT sv_SE
+ nl_NL nb_NO nn_NO no_NO pt_BR pt_PT sv_SE
ISO8859-2_UTF-8= hr_HR hu_HU ro_RO sk_SK sl_SI sr_YU
ISO8859-7_UTF-8= el_GR
ISO8859-9_UTF-8= tr_TR
Index: share/msgdef/Makefile
===================================================================
RCS file: /home/ncvs/src/share/msgdef/Makefile,v
retrieving revision 1.63
diff -u -r1.63 Makefile
--- share/msgdef/Makefile 28 Sep 2005 07:40:03 -0000 1.63
+++ share/msgdef/Makefile 27 Oct 2005 11:03:14 -0000
@@ -88,6 +88,7 @@
GB_LINKS= en_GB:en_AU en_GB:en_NZ
IT_LINKS= it_IT:it_CH
NL_LINKS= nl_NL:nl_BE
+NO_LINKS= no_NO:nb_NO no_NO:nn_NO
PT_LINKS= pt_PT:pt_BR
ENCODINGS= Big5 Big5HKSCS CP949 eucKR GB2312 GBK \
@@ -99,16 +100,16 @@
eucKR_UTF-8= ko_KR
GB2312_GBK= zh_CN
ISO8859-1_ISO8859-1= ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} ${IT_LINKS} \
- ${NL_LINKS} ${PT_LINKS}
+ ${NL_LINKS} ${NO_LINKS} ${PT_LINKS}
ISO8859-1_ISO8859-15= af_ZA ca_ES da_DK de_DE en_CA en_GB en_US es_ES \
eu_ES fi_FI fr_BE fr_CH fr_FR is_IS it_IT nl_NL no_NO \
pt_PT sv_SE \
${DE_LINKS} ${FR_LINKS} ${GB_LINKS} ${IT_LINKS} \
- ${NL_LINKS}
+ ${NL_LINKS} ${NO_LINKS}
ISO8859-1_US-ASCII= ${GB_LINKS} en_CA en_GB en_US
ISO8859-1_UTF-8= af_ZA ca_ES da_DK de_DE en_CA en_GB en_US es_ES eu_ES \
- fi_FI fr_BE fr_CH fr_FR is_IS it_IT nl_NL no_NO pt_PT \
- sv_SE
+ fi_FI fr_BE fr_CH fr_FR is_IS it_IT nb_NO nl_NL nn_NO no_NO \
+ pt_PT sv_SE
ISO8859-2_ISO8859-2= ${CZ_LINKS}
ISO8859-2_UTF-8= cs_CZ hr_HR hu_HU pl_PL ro_RO sl_SI
ISO8859-9_UTF-8= tr_TR
@@ -116,7 +117,7 @@
ISO8859-13_UTF-8= lt_LT
ISO8859-15_UTF-8= et_EE
UTF-8_UTF-8= ${CZ_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} en_GB:en_IE \
- ${IT_LINKS} ${NL_LINKS} ${PT_LINKS} zh_TW:zh_HK
+ ${IT_LINKS} ${NL_LINKS} ${NO_LINKS} ${PT_LINKS} zh_TW:zh_HK
SYMLINKS=
.for enc1 in ${ENCODINGS}
Index: share/numericdef/Makefile
===================================================================
RCS file: /home/ncvs/src/share/numericdef/Makefile,v
retrieving revision 1.59
diff -u -r1.59 Makefile
--- share/numericdef/Makefile 4 Mar 2005 14:24:30 -0000 1.59
+++ share/numericdef/Makefile 27 Oct 2005 10:48:28 -0000
@@ -70,6 +70,7 @@
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
+NO_LINKS= no_NO:nb_NO no_NO:nn_NO
US_LINKS= en_US:en_CA en_US:en_GB
ARMSCII-8_UTF-8= hy_AM
@@ -91,9 +92,9 @@
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} \
- ${IT_LINKS} ${US_LINKS}
+ ${IT_LINKS} ${NO_LINKS} ${US_LINKS}
ISO8859-1_ISO8859-1= ${BE_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} \
- ${IT_LINKS} ${US_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
@@ -112,7 +113,7 @@
PT154_UTF-8= kk_KZ
US-ASCII_UTF-8= en_US:he_IL
UTF-8_UTF-8= ${BE_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} en_GB:en_IE \
- ${IT_LINKS} ${US_LINKS}
+ ${IT_LINKS} ${NO_LINKS} ${US_LINKS}
SYMLINKS=
.for enc1 in ${ENCODINGS}
Index: share/timedef/Makefile
===================================================================
RCS file: /home/ncvs/src/share/timedef/Makefile,v
retrieving revision 1.48
diff -u -r1.48 Makefile
--- share/timedef/Makefile 4 Mar 2005 14:24:30 -0000 1.48
+++ share/timedef/Makefile 27 Oct 2005 11:13:15 -0000
@@ -54,6 +54,8 @@
lt_LT.ISO8859-13 \
lt_LT.UTF-8 \
nl_NL.ISO8859-1 \
+ nn_NO.ISO8859-1 \
+ nn_NO.UTF-8 \
no_NO.ISO8859-1 \
no_NO.UTF-8 \
pl_PL.ISO8859-2 \
@@ -115,15 +117,18 @@
FR_LINKS= fr_FR:fr_BE fr_FR:fr_CA fr_FR:fr_CH
IT_LINKS= it_IT:it_CH
NL_LINKS= nl_NL:nl_BE
+NO_LINKS= no_NO:nb_NO
GB_LINKS= en_GB:en_AU en_GB:en_CA en_GB:en_NZ
eucKR_CP949= ko_KR
GB2312_GBK= zh_CN
ISO8859-1_ISO8859-1= ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} ${IT_LINKS} \
- ${NL_LINKS} en_US:af_ZA
+ ${NL_LINKS} ${NO_LINKS} en_US:af_ZA
ISO8859-1_ISO8859-15= ca_ES da_DK de_AT de_DE en_GB en_US es_ES eu_ES \
- fi_FI fr_FR is_IS it_IT la_LN nl_NL no_NO pt_PT sv_SE \
- ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} ${IT_LINKS} ${NL_LINKS}
+ fi_FI fr_FR is_IS it_IT la_LN nl_NL nn_NO no_NO pt_PT \
+ sv_SE \
+ ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} ${IT_LINKS} ${NL_LINKS} \
+ ${NO_LINKS}
ISO8859-1_US-ASCII= ${GB_LINKS} en_GB en_US la_LN
ISO8859-1_ISO8859-2= la_LN
ISO8859-1_ISO8859-4= la_LN
@@ -131,6 +136,7 @@
ISO8859-15_ISO8859-15= en_US:af_ZA
UTF-8_Big5HKSCS= zh_TW:zh_HK
UTF-8_UTF-8= ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} ${IT_LINKS} ${NL_LINKS} \
+ ${NO_LINKS} \
en_GB:en_IE en_US:af_ZA zh_TW:zh_HK
SYMLINKS=
Index: share/timedef/nn_NO.ISO8859-1.src
===================================================================
RCS file: share/timedef/nn_NO.ISO8859-1.src
diff -N share/timedef/nn_NO.ISO8859-1.src
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ share/timedef/nn_NO.ISO8859-1.src 27 Oct 2005 11:10:01 -0000
@@ -0,0 +1,102 @@
+# $FreeBSD: src/share/timedef/no_NO.ISO8859-1.src,v 1.12 2001/03/21 22:54:44 ache Exp $
+#
+# WARNING: spaces may be essential at the end of lines
+# WARNING: empty lines are essential too
+#
+# Short months names
+#
+jan
+feb
+mar
+apr
+mai
+jun
+jul
+aug
+sep
+okt
+nov
+des
+#
+# Long months names
+#
+januar
+februar
+mars
+april
+mai
+juni
+juli
+august
+september
+oktober
+november
+desember
+#
+# Short weekdays names
+#
+sun
+mån
+tys
+ons
+tor
+fre
+lau
+#
+# Long weekdays names
+#
+sundag
+måndag
+tysdag
+onsdag
+torsdag
+fredag
+laurdag
+#
+# X_fmt
+#
+%H:%M:%S
+#
+# x_fmt
+#
+%d.%m.%Y
+#
+# c_fmt
+#
+%a %e %b %X %Y
+#
+# am
+#
+am
+#
+# pm
+#
+pm
+#
+# date_fmt
+#
+%a %e %b %Y %X %Z
+#
+# Long months names (alternative)
+#
+januar
+februar
+mars
+april
+mai
+juni
+juli
+august
+september
+oktober
+november
+desember
+#
+# md_order
+#
+dm
+#
+# ampm_fmt
+#
+%I:%M:%S %p
+# EOF
Index: share/timedef/nn_NO.UTF-8.src
===================================================================
RCS file: share/timedef/nn_NO.UTF-8.src
diff -N share/timedef/nn_NO.UTF-8.src
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ share/timedef/nn_NO.UTF-8.src 27 Oct 2005 11:11:17 -0000
@@ -0,0 +1,102 @@
+# $FreeBSD: src/share/timedef/no_NO.UTF-8.src,v 1.1 2004/03/27 08:14:15 tjr Exp $
+#
+# WARNING: spaces may be essential at the end of lines
+# WARNING: empty lines are essential too
+#
+# Short months names
+#
+jan
+feb
+mar
+apr
+mai
+jun
+jul
+aug
+sep
+okt
+nov
+des
+#
+# Long months names
+#
+januar
+februar
+mars
+april
+mai
+juni
+juli
+august
+september
+oktober
+november
+desember
+#
+# Short weekdays names
+#
+sun
+mån
+tys
+ons
+tor
+fre
+lau
+#
+# Long weekdays names
+#
+sundag
+måndag
+tysdag
+onsdag
+torsdag
+fredag
+laurdag
+#
+# X_fmt
+#
+%H:%M:%S
+#
+# x_fmt
+#
+%d.%m.%Y
+#
+# c_fmt
+#
+%a %e %b %X %Y
+#
+# am
+#
+am
+#
+# pm
+#
+pm
+#
+# date_fmt
+#
+%a %e %b %Y %X %Z
+#
+# Long months names (alternative)
+#
+januar
+februar
+mars
+april
+mai
+juni
+juli
+august
+september
+oktober
+november
+desember
+#
+# md_order
+#
+dm
+#
+# ampm_fmt
+#
+%I:%M:%S %p
+# EOF
