[incomplete PATCH] help needed with misc/45874

Joan Picanyol i Puig joan-dev at biaix.org
Mon Apr 28 12:12:51 PDT 2003


Hi ache@,

I'm attaching an updated version of the patch (cvs diff -R -c at
/usr/src in my -stable box) for you to commit. Many thanks to all the
input from people at i18n@

* Alexey Zelkin <phantom at FreeBSD.org.ua> [20030423 15:02]:
> btw, you also missed 'mklocale' stuff (which also have to be done for
> new locale) -- src/share/mklocale
Mmmhh... Catalan is most similar to Spanish, which seems to be covered
by src/share/mklocale/la_LN.ISO8859-{1,15}. Is this really needed?

tks
--
pica
-------------- next part --------------
Index: etc/locale.alias
===================================================================
RCS file: /fs/bulk/mount/FreeBSD/CVS/src/etc/locale.alias,v
retrieving revision 1.7.2.6
diff -u -3 -p -c -r1.7.2.6 locale.alias
*** etc/locale.alias	15 Apr 2002 00:44:13 -0000	1.7.2.6
--- etc/locale.alias	7 Dec 2002 20:40:23 -0000
*************** US-ASCII                en_US.US-ASCII
*** 5,10 ****
--- 5,12 ----
  af_ZA.ISO_8859-1        af_ZA.ISO8859-1
  af_ZA.ISO_8859-15       af_ZA.ISO8859-15
  cs_CZ.ISO_8859-2        cs_CZ.ISO8859-2
+ ca_ES.ISO_8859-1	ca_ES.ISO8859-1
+ ca_ES.ISO_8859-15	ca_ES.ISO8859-15
  da_DK.ISO_8859-1        da_DK.ISO8859-1
  da_DK.ISO_8859-15       da_DK.ISO8859-15
  de_AT.ISO_8859-1        de_AT.ISO8859-1
Index: etc/mtree/BSD.usr.dist
===================================================================
RCS file: /fs/bulk/mount/FreeBSD/CVS/src/etc/mtree/BSD.usr.dist,v
retrieving revision 1.188.2.40
diff -u -3 -p -c -r1.188.2.40 BSD.usr.dist
*** etc/mtree/BSD.usr.dist	14 Feb 2003 22:38:14 -0000	1.188.2.40
--- etc/mtree/BSD.usr.dist	28 Apr 2003 18:45:19 -0000
***************
*** 497,502 ****
--- 497,506 ----
              ..
              en_US.US-ASCII
              ..
+ 	    ca_ES.ISO8859-1
+ 	    ..
+ 	    ca_ES.ISO8859-15
+ 	    ..
              es_ES.ISO8859-1
              ..
              es_ES.ISO8859-15
Index: share/colldef/Makefile
===================================================================
RCS file: /fs/bulk/mount/FreeBSD/CVS/src/share/colldef/Makefile,v
retrieving revision 1.32.2.11
diff -u -3 -p -c -r1.32.2.11 Makefile
*** share/colldef/Makefile	17 Aug 2002 19:14:44 -0000	1.32.2.11
--- share/colldef/Makefile	28 Apr 2003 18:53:21 -0000
*************** LOCALES=	bg_BG.CP1251 \
*** 11,16 ****
--- 11,18 ----
  		el_GR.ISO8859-7 \
  		es_ES.ISO8859-1 \
  		es_ES.ISO8859-15 \
+ 		ca_ES.ISO8859-1 \
+ 		ca_ES.ISO8859-15 \
  		et_EE.ISO8859-15 \
  		hi_IN.ISCII-DEV \
  		is_IS.ISO8859-1 \
*************** de_DE.ISO8859-15.out:   map.ISO8859-15
*** 57,63 ****
--- 59,67 ----
  de_DE.ISO8859-1.out:    map.ISO8859-1
  el_GR.ISO8859-7.out:    map.ISO8859-7
  es_ES.ISO8859-15.out:   map.ISO8859-15
+ ca_ES.ISO8859-15.out:   map.ISO8859-15
  es_ES.ISO8859-1.out:    map.ISO8859-1
+ ca_ES.ISO8859-1.out:    map.ISO8859-1
  et_EE.ISO8859-15.out:   map.ISO8859-15
  hi_IN.ISCII-DEV.out:	map.ISCII-DEV
  is_IS.ISO8859-15.out:   map.ISO8859-15
Index: share/monetdef/Makefile
===================================================================
RCS file: /fs/bulk/mount/FreeBSD/CVS/src/share/monetdef/Makefile,v
retrieving revision 1.37.2.3
diff -u -3 -p -c -r1.37.2.3 Makefile
*** share/monetdef/Makefile	17 Aug 2002 19:38:08 -0000	1.37.2.3
--- share/monetdef/Makefile	6 Dec 2002 18:16:50 -0000
*************** LOCALES=        af_ZA.ISO8859-1 \
*** 17,22 ****
--- 17,23 ----
  		en_NZ.ISO8859-1 \
  		en_US.ISO8859-1 \
  		es_ES.ISO8859-1 \
+ 		ca_ES.ISO8859-1 \
  		et_EE.ISO8859-15 \
  		fi_FI.ISO8859-1 \
  		fr_BE.ISO8859-1 \
*************** LOCALEDIR=      ${DESTDIR}/usr/share/loc
*** 52,59 ****
  
  ASCIILINKS=	en_AU en_CA en_GB en_NZ en_US
  LATIN15LINKS=	af_ZA 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 is_IS it_IT it_CH \
! 		nl_BE nl_NL no_NO pt_PT sv_SE
  
  CH_SRC=		de_CH
  CH_LINKS=	fr_CH it_CH
--- 53,60 ----
  
  ASCIILINKS=	en_AU en_CA en_GB en_NZ en_US
  LATIN15LINKS=	af_ZA da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_NZ en_US \
! 		ca_ES es_ES fi_FI fr_BE fr_CA fr_CH fr_FR is_IS is_IS it_IT \
! 		it_CH nl_BE nl_NL no_NO pt_PT sv_SE
  
  CH_SRC=		de_CH
  CH_LINKS=	fr_CH it_CH
Index: share/msgdef/Makefile
===================================================================
RCS file: /fs/bulk/mount/FreeBSD/CVS/src/share/msgdef/Makefile,v
retrieving revision 1.38.2.3
diff -u -3 -p -c -r1.38.2.3 Makefile
*** share/msgdef/Makefile	17 Aug 2002 19:30:37 -0000	1.38.2.3
--- share/msgdef/Makefile	28 Apr 2003 18:54:04 -0000
*************** LOCALES=	af_ZA.ISO8859-1 \
*** 13,18 ****
--- 13,20 ----
  		en_GB.ISO8859-1 \
  		en_US.ISO8859-1 \
  		es_ES.ISO8859-1 \
+ 		ca_ES.ISO8859-1 \
+ 		ca_ES.ISO8859-15 \
  		et_EE.ISO8859-15 \
  		fi_FI.ISO8859-1 \
  		fr_BE.ISO8859-1 \
Index: share/numericdef/Makefile
===================================================================
RCS file: /fs/bulk/mount/FreeBSD/CVS/src/share/numericdef/Makefile,v
retrieving revision 1.36.2.3
diff -u -3 -p -c -r1.36.2.3 Makefile
*** share/numericdef/Makefile	17 Aug 2002 19:34:11 -0000	1.36.2.3
--- share/numericdef/Makefile	28 Apr 2003 18:54:33 -0000
*************** LOCALES=	af_ZA.ISO8859-1 \
*** 11,16 ****
--- 11,18 ----
  		el_GR.ISO8859-7 \
  		en_US.ISO8859-1 \
  		es_ES.ISO8859-1 \
+ 		ca_ES.ISO8859-1 \
+ 		ca_ES.ISO8859-15 \
  		et_EE.ISO8859-15 \
  		fi_FI.ISO8859-1 \
  		fr_BE.ISO8859-1 \
Index: share/timedef/Makefile
===================================================================
RCS file: /fs/bulk/mount/FreeBSD/CVS/src/share/timedef/Makefile,v
retrieving revision 1.11.2.11
diff -u -3 -p -c -r1.11.2.11 Makefile
*** share/timedef/Makefile	17 Aug 2002 19:25:45 -0000	1.11.2.11
--- share/timedef/Makefile	6 Dec 2002 17:49:37 -0000
*************** LOCALES=	bg_BG.CP1251 \
*** 12,17 ****
--- 12,18 ----
  		en_GB.ISO8859-1 \
  		en_US.ISO8859-1 \
  		es_ES.ISO8859-1 \
+ 		ca_ES.ISO8859-1 \
  		et_EE.ISO8859-15 \
  		fi_FI.ISO8859-1 \
  		fr_FR.ISO8859-1 \
*************** LOCALES=	bg_BG.CP1251 \
*** 45,51 ****
  
  LOCALEDIR=      ${DESTDIR}/usr/share/locale
  
! LATIN15LINKS=	da_DK de_AT de_DE en_GB en_US es_ES fi_FI fr_FR is_IS \
  		it_IT la_LN nl_NL no_NO pt_PT sv_SE
  DE_LINKS=	de_CH
  FR_LINKS=	fr_BE fr_CA fr_CH
--- 46,52 ----
  
  LOCALEDIR=      ${DESTDIR}/usr/share/locale
  
! LATIN15LINKS=	da_DK de_AT de_DE en_GB en_US ca_ES es_ES fi_FI fr_FR is_IS \
  		it_IT la_LN nl_NL no_NO pt_PT sv_SE
  DE_LINKS=	de_CH
  FR_LINKS=	fr_BE fr_CA fr_CH


More information about the freebsd-i18n mailing list