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

[Edwin Groothuis]

Author: edwin
Date: Wed Sep 16 13:11:37 2009
New Revision: 197254
URL: http://svn.freebsd.org/changeset/base/197254

Log:
  I can't find any way to tell libiconv to stay away from 0x2E (.)
  alone, therefor we implement a after-the-iconv-translation map for
  this.

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

Modified: user/edwin/locale/share/Makefile.def.inc
==============================================================================
--- user/edwin/locale/share/Makefile.def.inc	Wed Sep 16 12:22:19 2009	(r197253)
+++ user/edwin/locale/share/Makefile.def.inc	Wed Sep 16 13:11:37 2009	(r197254)
@@ -271,11 +271,17 @@ ICONV_${ccln}.${cms}=	${ICONV}
 CMALIAS_${cm}=	${cm}
 . endif
 
-. if !defined(TRANSLATION_${cm})
-TRANSLATION_${cm}=
+. if !defined(TRANSLATIONBEFORE_${cm})
+TRANSLATIONBEFORE_${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 }'
+. if !defined(TRANSLATIONAFTER_${cm})
+TRANSLATIONAFTER_${cm}=
+. endif
+. for TR in ${TRANSLATIONBEFORE_${cm}}
+_TRANSLATIONBEFORE_${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
+. for TR in ${TRANSLATIONAFTER_${cm}}
+_TRANSLATIONAFTER_${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
 
@@ -304,10 +310,11 @@ ${ccln}.UTF-8.out: ${ccln}.src
 
 ${ccln}.${cms}.out: ${ccln}.UTF-8.out
 	cat ${.ALLSRC} \
-	${_TRANSLATION_${cms}} | \
+	${_TRANSLATIONBEFORE_${cms}} | \
 	${ICONV_${ccln}.${cms}} \
 	    -f UTF-8 \
 	    -t ${CMALIAS_${cms}} \
+	${_TRANSLATIONAFTER_${cms}} \
 	    > ${.TARGET} \
 	|| rm ${.TARGET} && exit 0
 

Modified: user/edwin/locale/share/monetdef/Makefile
==============================================================================
--- user/edwin/locale/share/monetdef/Makefile	Wed Sep 16 12:22:19 2009	(r197253)
+++ user/edwin/locale/share/monetdef/Makefile	Wed Sep 16 13:11:37 2009	(r197254)
@@ -78,8 +78,8 @@ CCLNLINK_no_NO=	nb_NO nn_NO
 
 # Some locales are not fully one-on-one, therefore need to be
 # translated manually (multiple allowed)
-TRANSLATION_eucKR=	E282A9:5C	# Won sign
-TRANSLATION_ISO8859-1=	E282AC:4575	# Euro sign
+TRANSLATIONBEFORE_eucKR=	E282A9:5C	# Won sign
+TRANSLATIONBEFORE_ISO8859-1=	E282AC:4575	# Euro sign
 
 # For these locales, create symlinks to the main locale for historical reasons.
 LEGLINK_ja_JP=		jp_JP

Modified: user/edwin/locale/share/msgdef/Makefile
==============================================================================
--- user/edwin/locale/share/msgdef/Makefile	Wed Sep 16 12:22:19 2009	(r197253)
+++ user/edwin/locale/share/msgdef/Makefile	Wed Sep 16 13:11:37 2009	(r197254)
@@ -73,6 +73,9 @@ CCLNLINK_pt_PT=		pt_BR
 CCLNLINK_zh_Hant_TW=	zh_Hant_HK
 CCLNLINK_en_GB.UTF-8=	en_IE.UTF-8
 
+#
+TRANSLATIONAFTER_ARMSCII-8=	5DA9:5D2E	# ]. fixing
+
 # For these locales, create symlinks to the main locale for historical reasons.
 LEGLINK_ja_JP=		jp_JP
 LEGLINK_zh_Hans_CN=	zh_CN