From: Amos Jeffries <squid3@treenet.co.nz>
Date: Wed, 10 Feb 2010 11:40:58 +0000 (+1300)
Subject: Remove tidyHtml from the template generation tools.
X-Git-Tag: SQUID_3_2_0_1~426
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ea6cdca05c20a670781505cdfa58132cfbde06a;p=thirdparty%2Fsquid.git

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 used automatically by the translate toolkit from 1.5.0 so
needs to be expicitly disabled when present.
---

diff --git a/errors/Makefile.am b/errors/Makefile.am
index 3d69ce7f52..cd794c351b 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; \