svn commit: r196908 - in user/edwin/locale/share: . monetdef

Edwin Groothuis edwin at FreeBSD.org
Sun Sep 6 22:50:22 UTC 2009


Author: edwin
Date: Sun Sep  6 22:50:22 2009
New Revision: 196908
URL: http://svn.freebsd.org/changeset/base/196908

Log:
  Manually translate the WON Currency sign and the EURO currency sign
  for certain locales.

Modified:
  user/edwin/locale/share/Makefile.def.inc
  user/edwin/locale/share/monetdef/Makefile

Modified: user/edwin/locale/share/Makefile.def.inc
==============================================================================
--- user/edwin/locale/share/Makefile.def.inc	Sun Sep  6 21:22:24 2009	(r196907)
+++ user/edwin/locale/share/Makefile.def.inc	Sun Sep  6 22:50:22 2009	(r196908)
@@ -8,8 +8,8 @@
 CMALIAS_ISCII-DEV=	macdevanaga
 
 # libiconv doesn't understand iscii-dev, bsdiconv does
-ICONV=	/home/edwin/libiconv/bin/iconv
-ICONV_hi_IN.ISCII-DEV=	/usr/bin/iconv
+ICONV=	iconv
+ICONV_hi_IN.ISCII-DEV=	bsdiconv
 
 #
 # Calculated variables
@@ -148,6 +148,13 @@ ICONV_${ccln}.${cms}=	${ICONV}
 . if !defined(CMALIAS_${cm})
 CMALIAS_${cm}=	${cm}
 . endif
+
+. if !defined(TRANSLATION_${cm})
+TRANSLATION_${cm}=
+. endif
+. for TR in ${TRANSLATION_${cm}}
+_TRANSLATION_${cm}+=	 | awk '{ gsub("${TR:C/:.*//:C/([0-9a-fA-F][0-9a-fA-F])/\\\\x\1/g}", "${TR:C/^.*://:C/([0-9a-fA-F][0-9a-fA-F])/\\\\x\1/g}"); print }'
+. endfor
 .endfor
 
 #
@@ -174,10 +181,12 @@ ${ccln}.UTF-8.out: ${ccln}.src
 .  for cms in ${CMS_${ccln}}
 
 ${ccln}.${cms}.out: ${ccln}.src
+	cat ${.ALLSRC} \
+	${_TRANSLATION_${cms}} | \
 	${ICONV_${ccln}.${cms}} \
 	    -f UTF-8 \
 	    -t ${CMALIAS_${cms}} \
-	    ${.ALLSRC} > ${.TARGET} \
+	    > ${.TARGET} \
 	|| rm ${.TARGET} && exit 0
 
 .  endfor

Modified: user/edwin/locale/share/monetdef/Makefile
==============================================================================
--- user/edwin/locale/share/monetdef/Makefile	Sun Sep  6 21:22:24 2009	(r196907)
+++ user/edwin/locale/share/monetdef/Makefile	Sun Sep  6 22:50:22 2009	(r196908)
@@ -75,6 +75,11 @@ CCLNLINK_es_ES=	eu_ES
 CCLNLINK_de_CH=	fr_CH it_CH
 CCLNLINK_no_NO=	nb_NO nn_NO
 
+# Some locales are not fully one-on-one, therefore need to be
+# translated manually.
+TRANSLATION_eucKR=	E282A9:5C
+TRANSLATION_ISO8859-1=	E282AC:455552
+
 # For these locales, create symlinks to the main locale for historical reasons.
 LEGLINK_ja_JP=		jp_JP
 LEGLINK_zh_Hans_CN=	zh_CN
@@ -91,8 +96,8 @@ LEGLINK_zh_Hans_CN.GBK2312=	zh_CN.GBK
 # Required variables
 LCTYPE=		LC_NUMERIC
 LOCALEDIR=	/usr/share/locale
-ICONV_pt_PT.ISO8859-1=	/usr/bin/iconv
-ICONV_ko_KR.eucKR=	/usr/bin/iconv
+#ICONV_pt_PT.ISO8859-1=	bsdiconv
+#ICONV_ko_KR.eucKR=	bsdiconv
 
 # For testing only
 DESTDIR=	/home/edwin/locale/new/


More information about the svn-src-user mailing list