From 6a2bc699815b1a0d5efd2faa2b819383a24a6ef7 Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Sat, 13 Feb 2010 01:31:01 +1300 Subject: [PATCH] Remove tidyHtml from the template generation tools. While nice, It introduces several problems: * any syntax errors at all in the translation text causes a blank translated text file to be produced. Without any error code. * automatically downgrades the HTML content-type meta to "us-ascii" despite the input and output both actually being UTF-8 * added dependency for building. It's now used automatically by the translate toolkit from 1.5.0 so needs to be expicitly disabled when present. --- errors/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/errors/Makefile.am b/errors/Makefile.am index 9795aa05f0..8277e34c82 100644 --- a/errors/Makefile.am +++ b/errors/Makefile.am @@ -111,6 +111,8 @@ translate-warn: $(TRANSLATE_LANGUAGES): $(ERROR_TEMPLATES) +NOTIDY=`$(PO2HTML) --help | grep -o "\-\-notidy"` + .po.lang: if test "$(PO2HTML)" != "" && test "$(PO2HTML)" != "no" && test "$(PO2HTML)" != "off" && test -f $(top_srcdir)/errors/en.po; then \ lang=`basename $@ .lang`; \ @@ -118,7 +120,7 @@ $(TRANSLATE_LANGUAGES): $(ERROR_TEMPLATES) echo -n "Translate '$$lang' ..."; \ for f in $(ERROR_TEMPLATES); do \ page=`basename $$f`; \ - $(PO2HTML) --progress=none -i $(top_srcdir)/errors/$$lang.po -t $(top_srcdir)/errors/$$f >$(top_builddir)/errors/$$lang/$$page || exit 1; \ + $(PO2HTML) $(NOTIDY) --progress=none -i $(top_srcdir)/errors/$$lang.po -t $(top_srcdir)/errors/$$f >$(top_builddir)/errors/$$lang/$$page || exit 1; \ done; \ echo "done."; \ fi; \ -- 2.47.3