From 832689be3b7a99ba8d394445a2e1e01b97e08e6c Mon Sep 17 00:00:00 2001 From: Warren Block Date: Fri, 16 Oct 2015 22:30:02 +0000 Subject: [PATCH] Use the en_US xmllint catalog variables so translated entities do not make their way into PO translations. Reviewed by: rene --- share/mk/doc.docbook.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk index d49ea5b122..ec54c71e61 100644 --- a/share/mk/doc.docbook.mk +++ b/share/mk/doc.docbook.mk @@ -278,6 +278,7 @@ TRAN_DIR?= ${MASTERDOC:H} EN_DIR?= ${TRAN_DIR:S/${LANGCODE}/en_US.ISO8859-1/} PO_LANG?= ${LANGCODE:C/\..*$//} PO_CHARSET?= ${LANGCODE:tl:C/^.*\.//:S/^iso/iso-/:S/utf-8/UTF-8/} +EN_XMLLINT?= ${XMLLINT:S/${PO_LANG}/en_US/g} CLEANFILES+= ${DOC}.translate.xml ${PO_LANG}.mo # fix settings in PO file @@ -292,9 +293,9 @@ ${DOC}.translate.xml: exit 1 ; \ fi # normalize the English original into a single file - @${XMLLINT} --nonet --noent --valid --xinclude ${MASTERDOC_EN} > ${.TARGET}.tmp + @${EN_XMLLINT} --nonet --noent --valid --xinclude ${MASTERDOC_EN} > ${.TARGET}.tmp # remove redundant namespace attributes - @${XMLLINT} --nsclean ${.TARGET}.tmp > ${.TARGET} + @${EN_XMLLINT} --nsclean ${.TARGET}.tmp > ${.TARGET} @${RM} ${.TARGET}.tmp po: ${PO_LANG}.po