Chapril/xmpp.chapril.org-conversejs
Chapril
/
xmpp.chapril.org-conversejs
24
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Fall back to using python as xgettext language 

if javascript is not supported. Fixes #573
This commit is contained in:
JC Brand 2016-02-08 08:58:57 +00:00
parent cbdda26a19
commit a42ce378a1
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -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:

4
docs/CHANGES.md
View File

@ -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