From owner-freebsd-i18n@FreeBSD.ORG Tue Apr 22 08:20:18 2003 Return-Path: Delivered-To: freebsd-i18n@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 46E9D37B401 for ; Tue, 22 Apr 2003 08:20:18 -0700 (PDT) Received: from grummit.biaix.org (213-97-212-86.uc.nombres.ttd.es [213.97.212.86]) by mx1.FreeBSD.org (Postfix) with SMTP id 5575C43FAF for ; Tue, 22 Apr 2003 08:20:16 -0700 (PDT) (envelope-from joan@grummit.biaix.org) Received: (qmail 2527 invoked by uid 1000); 22 Apr 2003 15:17:39 -0000 Date: Tue, 22 Apr 2003 17:17:39 +0200 From: Joan Picanyol i Puig To: freebsd-i18n@freebsd.org Message-ID: <20030422151739.GA2097@grummit.biaix.org> Mail-Followup-To: lists-freebsd-i18n@biaix.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="mP3DRpeJDSE+ciuQ" Content-Disposition: inline User-Agent: Mutt/1.4i Subject: [incomplete PATCH] help needed with misc/45874 X-BeenThere: freebsd-i18n@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: FreeBSD Internationalization Effort List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Apr 2003 15:20:18 -0000 --mP3DRpeJDSE+ciuQ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline [please honour Mail-Followup-To:, not subscribed] Hi, I submitted misc/45874, but did not quite make it :( My patch modified some Makefiles in /usr/src/share/ and provided the translations I deemed necessary. However, applying the patch does not work :( The directory structure is not created, at least there's /usr/src/etc/locale.alias to be completed (I'm attaching a diff of my share and etc directories). I'm relatively new to FreeBSD and I'm not acquainted with it's sources, and I ask: 1. What files do I need to modify to make buildworld create the ca_ES locale (to effectively add it to FreeBSD)? 2. What's the difference between the different naming conventions for ISO[_-]*8859-15 files? Which one should I use? tks -- pica --mP3DRpeJDSE+ciuQ Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="share.diff" 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 -r1.32.2.11 Makefile --- share/colldef/Makefile 17 Aug 2002 19:14:44 -0000 1.32.2.11 +++ share/colldef/Makefile 6 Dec 2002 17:49:37 -0000 @@ -11,6 +11,8 @@ LOCALES= bg_BG.CP1251 \ el_GR.ISO8859-7 \ es_ES.ISO8859-1 \ es_ES.ISO8859-15 \ + ca_ES.ISO8859-15 \ + ca_ES.ISO8859-15 \ et_EE.ISO8859-15 \ hi_IN.ISCII-DEV \ is_IS.ISO8859-1 \ @@ -57,7 +59,9 @@ de_DE.ISO8859-15.out: map.ISO8859-15 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 -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 @@ -17,6 +17,7 @@ LOCALES= af_ZA.ISO8859-1 \ 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 \ @@ -52,8 +53,8 @@ LOCALEDIR= ${DESTDIR}/usr/share/loc 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 + 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 -r1.38.2.3 Makefile --- share/msgdef/Makefile 17 Aug 2002 19:30:37 -0000 1.38.2.3 +++ share/msgdef/Makefile 6 Dec 2002 17:49:37 -0000 @@ -13,6 +13,7 @@ LOCALES= af_ZA.ISO8859-1 \ 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_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 -r1.36.2.3 Makefile --- share/numericdef/Makefile 17 Aug 2002 19:34:11 -0000 1.36.2.3 +++ share/numericdef/Makefile 6 Dec 2002 17:49:37 -0000 @@ -11,6 +11,7 @@ LOCALES= af_ZA.ISO8859-1 \ el_GR.ISO8859-7 \ en_US.ISO8859-1 \ es_ES.ISO8859-1 \ + ca_ES.ISO8859-1 \ 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 -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 @@ -12,6 +12,7 @@ LOCALES= bg_BG.CP1251 \ 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 \ @@ -45,7 +46,7 @@ LOCALES= bg_BG.CP1251 \ LOCALEDIR= ${DESTDIR}/usr/share/locale -LATIN15LINKS= da_DK de_AT de_DE en_GB en_US es_ES fi_FI fr_FR is_IS \ +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 --mP3DRpeJDSE+ciuQ Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="etc.diff" 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 -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 @@ -5,6 +5,8 @@ US-ASCII en_US.US-ASCII 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 --mP3DRpeJDSE+ciuQ-- From owner-freebsd-i18n@FreeBSD.ORG Wed Apr 23 06:05:00 2003 Return-Path: Delivered-To: freebsd-i18n@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 319C437B401 for ; Wed, 23 Apr 2003 06:05:00 -0700 (PDT) Received: from relay1.cris.net (relay1.cris.net [212.110.128.64]) by mx1.FreeBSD.org (Postfix) with ESMTP id E296B43F3F for ; Wed, 23 Apr 2003 06:04:53 -0700 (PDT) (envelope-from ml@phantom.cris.net) Received: from phantom.cris.net (root@phantom.cris.net [212.110.130.74]) by relay1.cris.net (8.12.6/8.12.6) with ESMTP id h3NFDQu2095131; Wed, 23 Apr 2003 15:13:27 GMT Received: (from ml@localhost) by phantom.cris.net (8.12.6/8.12.2) id h3NDBKEP028150; Wed, 23 Apr 2003 16:11:20 +0300 (EEST) (envelope-from ml) Date: Wed, 23 Apr 2003 16:11:20 +0300 From: Alexey Zelkin To: lists-freebsd-i18n@biaix.org Message-ID: <20030423161120.A28072@phantom.cris.net> References: <20030422151739.GA2097@grummit.biaix.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <20030422151739.GA2097@grummit.biaix.org>; from lists-freebsd-i18n@biaix.org on Tue, Apr 22, 2003 at 05:17:39PM +0200 X-Operating-System: FreeBSD 4.7-STABLE i386 cc: i18n@freebsd.org Subject: Re: [incomplete PATCH] help needed with misc/45874 X-BeenThere: freebsd-i18n@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: FreeBSD Internationalization Effort List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Apr 2003 13:05:00 -0000 On Tue, Apr 22, 2003 at 05:17:39PM +0200, Joan Picanyol i Puig wrote: > [please honour Mail-Followup-To:, not subscribed] > > Hi, > > I submitted misc/45874, but did not quite make it :( > > My patch modified some Makefiles in /usr/src/share/ and provided the > translations I deemed necessary. However, applying the patch does not > work :( The directory structure is not created, at least there's > /usr/src/etc/locale.alias to be completed (I'm attaching a diff of my > share and etc directories). > > I'm relatively new to FreeBSD and I'm not acquainted with it's sources, > and I ask: > > 1. What files do I need to modify to make buildworld create the ca_ES > locale (to effectively add it to FreeBSD)? src/etc/mtree/... to create directories for new locale files btw, you also missed 'mklocale' stuff (which also have to be done for new locale) -- src/share/mklocale > 2. What's the difference between the different naming conventions for > ISO[_-]*8859-15 files? Which one should I use? ISO8859 is default one, others are compat leftovers. > 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 -r1.32.2.11 Makefile > --- share/colldef/Makefile 17 Aug 2002 19:14:44 -0000 1.32.2.11 > +++ share/colldef/Makefile 6 Dec 2002 17:49:37 -0000 > @@ -11,6 +11,8 @@ LOCALES= bg_BG.CP1251 \ > el_GR.ISO8859-7 \ > es_ES.ISO8859-1 \ > es_ES.ISO8859-15 \ > + ca_ES.ISO8859-15 \ Looks like you wanted to use '-1' suffix here > + ca_ES.ISO8859-15 \ > et_EE.ISO8859-15 \ > hi_IN.ISCII-DEV \ > is_IS.ISO8859-1 \ > @@ -57,7 +59,9 @@ de_DE.ISO8859-15.out: map.ISO8859-15 > 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 -r1.37.2.3 Makefile [..] > 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 -r1.38.2.3 Makefile > --- share/msgdef/Makefile 17 Aug 2002 19:30:37 -0000 1.38.2.3 > +++ share/msgdef/Makefile 6 Dec 2002 17:49:37 -0000 > @@ -13,6 +13,7 @@ LOCALES= af_ZA.ISO8859-1 \ > en_GB.ISO8859-1 \ > en_US.ISO8859-1 \ > es_ES.ISO8859-1 \ > + ca_ES.ISO8859-1 \ Hmm.. What about '-15' here ? > 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 -r1.36.2.3 Makefile > --- share/numericdef/Makefile 17 Aug 2002 19:34:11 -0000 1.36.2.3 > +++ share/numericdef/Makefile 6 Dec 2002 17:49:37 -0000 > @@ -11,6 +11,7 @@ LOCALES= af_ZA.ISO8859-1 \ > el_GR.ISO8859-7 \ > en_US.ISO8859-1 \ > es_ES.ISO8859-1 \ > + ca_ES.ISO8859-1 \ Same as before. > 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 -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 [..] > 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 -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 [..]