From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 8 Mar 2009 13:05:01 +0000 (+1300)
Subject: Fix several issues in translation uncovered by further testing.
X-Git-Tag: SQUID_3_1_0_7~22
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ad500332b27b69056fc583bae5c5ba3a3538ba2e;p=thirdparty%2Fsquid.git

Fix several issues in translation uncovered by further testing.
---

diff --git a/errors/Makefile.am b/errors/Makefile.am
index ba4fd45cbf..ea57fcaeb6 100644
--- a/errors/Makefile.am
+++ b/errors/Makefile.am
@@ -25,6 +25,7 @@ TRANSLATIONS = \
 	en en-au en-gb en-nz en-us \
 	es \
 	et \
+	fa \
 	fi \
 	fr \
 	hy \
@@ -40,6 +41,7 @@ TRANSLATIONS = \
 	sv \
 	tr \
 	uk \
+	uz \
 	zh-cn
 
 # Legacy language contributions...
@@ -81,15 +83,17 @@ install-data-local:
 
 
 uninstall-local:
-	@ for l in $(LANGUAGES); do \
-		for f in $(srcdir)/$$l/ERR_*; do \
-	        	rm -f $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$l/`basename $$f`; \
+	@ for l in $(LANGUAGES) templates; do \
+		for f in $(top_srcdir)/errors/$$l/ERR_*; do \
+	        	$(RM) $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$l/`basename $$f`; \
 		done; \
 	done; \
-	for l in $(TRANSLATIONS) templates; do \
-	  if test -d $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$l; then \
-		for f in $(srcdir)/$$l/ERR_*; do \
-	        	rm -f $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$l/`basename $$f`; \
+	for l in $(TRANSLATIONS); do \
+	  if test -d $(srcdir)/errors/$$l; then \
+		for f in $(srcdir)/errors/$$l/ERR_*; do \
+			if test -f $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$l/`basename $$f`; then \
+		        	$(RM) $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$l/`basename $$f`; \
+			fi; \
 		done; \
 	  fi \
 	done;
@@ -121,7 +125,7 @@ addlang: all
 	fi \
 	fi
 
-dist-hook:
+dist-hook: translate
 	for lang in $(LANGUAGES) templates; do \
 	  if test -d $(srcdir)/$$lang ; then \
 		test -d $(distdir)/$$lang \
@@ -131,30 +135,31 @@ dist-hook:
 		  || exit 1; \
 	  fi; \
 	done; \
-	$(MAKE) translate; \
 	for lang in $(TRANSLATIONS); do \
 	  if test -d $$lang ; then \
 		test -d $(distdir)/$$lang \
 		  || mkdir $(distdir)/$$lang \
 		  || exit 1; \
-		cp -p $$lang/ERR_*  $(distdir)/$$lang \
+		cp -p $(top_builddir)/errors/$$lang/ERR_*  $(distdir)/$$lang \
 		  || exit 1; \
 	  fi; \
 	done; \
 	cp -p $(srcdir)/errorpage.css  $(distdir)/errorpage.css
 
 translate:
-	@ if test "$(PO2HTML)" != "" && test "$(PO2HTML)" != "no" && test "$(PO2HTML)" != "off"; then \
+	@if test -f $(top_srcdir)/errors/en.po; then \
+	  echo "Translation is not currently possible."; \
+	  exit 0; \
+	fi; \
+	if test "$(PO2HTML)" != "" && test "$(PO2HTML)" != "no" && test "$(PO2HTML)" != "off" && test -f $(top_srcdir)/errors/en.po; then \
 	  for lang in $(TRANSLATIONS); do \
-		test -d $$lang && rm -r $$lang; \
-		mkdir $$lang; \
-		cd $$lang; \
+		test -d $(top_builddir)/errors/$$lang && $(RM) -r $(top_builddir)/errors/$$lang; \
+		mkdir $(top_builddir)/errors/$$lang || exit 1; \
 		echo -n "Translate '$$lang' ..."; \
-		for f in `ls -1 ../$(srcdir)/templates`; do \
-			$(PO2HTML) --progress=none -i ../$(srcdir)/$$lang.po -t ../$(srcdir)/templates/$$f >$$f || exit 1; \
+		for f in `ls -1 $(top_srcdir)/errors/templates`; do \
+			$(PO2HTML) --progress=none -i $(top_srcdir)/errors/$$lang.po -t $(top_srcdir)/errors/templates/$$f >$(top_builddir)/errors/$$lang/$$f || exit 1; \
 		done; \
 		echo "done."; \
-		cd ..; \
 	  done; \
 	else \
 	  if test "$(PO2HTML)" = "off" ; then \
@@ -166,5 +171,4 @@ translate:
 	  echo "http://www.squid-cache.org/Versions/langpack/"; \
 	fi
 
-all:
-	$(MAKE) translate
+all: translate