From a42ce378a17fd54de5c9fc5df31f4b54f9cff682 Mon Sep 17 00:00:00 2001 From: JC Brand Date: Mon, 8 Feb 2016 08:58:57 +0000 Subject: [PATCH] Fall back to using python as xgettext language if javascript is not supported. Fixes #573 --- Makefile | 4 +++- docs/CHANGES.md | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9302b9d50..a6cca6f98 100644 --- a/Makefile +++ b/Makefile @@ -62,9 +62,11 @@ serve: stamp-npm ######################################################################## ## Translation machinery +GETTEXT = xgettext --keyword=__ --keyword=___ --from-code=UTF-8 --output=locale/converse.pot converse.js --package-name=Converse.js --copyright-holder="Jan-Carel Brand" --package-version=0.10.1 -c + .PHONY: pot pot: - xgettext --keyword=__ --keyword=___ --from-code=UTF-8 --output=locale/converse.pot converse.js --package-name=Converse.js --copyright-holder="Jan-Carel Brand" --package-version=0.10.1 -c --language="javascript"; + $(GETTEXT) --language="javascript" 2>&1 > /dev/null; test $$? -eq 0 && exit 0 || $(GETTEXT) --language="python" && exit $$?; .PHONY: po po: diff --git a/docs/CHANGES.md b/docs/CHANGES.md index 403bd795b..7ccf1f58c 100755 --- a/docs/CHANGES.md +++ b/docs/CHANGES.md @@ -1,5 +1,9 @@ # Changelog +## 0.10.2 (Unreleased) + +- #573 xgettext build error: `'javascript' unknown` + ## 0.10.1 (2016-02-06) - #352 When the user has manually scrolled up in a chat window, don't scroll