From: Jaroslav Kysela Date: Mon, 22 Jun 2015 19:27:56 +0000 (+0200) Subject: intl: add comments extraction for gettext (///) X-Git-Tag: v4.2.1~2256 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=774ca994cb94222ca5f5442d28668bc06719ec06;p=thirdparty%2Ftvheadend.git intl: add comments extraction for gettext (///) --- diff --git a/Makefile b/Makefile index 4cf276ec7..44a7fe05e 100644 --- a/Makefile +++ b/Makefile @@ -98,7 +98,7 @@ BUNDLE_FLAGS = ${BUNDLE_FLAGS-yes} # MKBUNDLE = $(PYTHON) $(ROOTDIR)/support/mkbundle -XGETTEXT2 ?= $(XGETTEXT) --language=C -k_ -kN_ -s +XGETTEXT2 ?= $(XGETTEXT) --language=C --add-comments=/ -k_ -kN_ -s MSGMERGE ?= msgmerge # diff --git a/Makefile.webui b/Makefile.webui index 538e79f1a..05d844ff7 100644 --- a/Makefile.webui +++ b/Makefile.webui @@ -34,7 +34,7 @@ CSS_PY = PYTHONIOENCODING=utf-8 $(PYTHON) support/css.py RUN_JS = PYTHONIOENCODING=utf-8 $(PYTHON) vendor/rjsmin-1.0.10/rjsmin.py RUN_CSS = PYTHONIOENCODING=utf-8 $(PYTHON) vendor/rcssmin-1.0.5/rcssmin.py GZIPCMD += -n -XGETTEXT2 ?= $(XGETTEXT) --language=JavaScript --from-code=utf-8 -k_ -kN_ -s +XGETTEXT2 ?= $(XGETTEXT) --language=JavaScript --from-code=utf-8 --add-comments=/ -k_ -kN_ -s MSGMERGE ?= msgmerge POJS_PY = PYTHONIOENCODING=utf-8 $(PYTHON) support/pojs.py diff --git a/src/webui/static/app/tvheadend.js b/src/webui/static/app/tvheadend.js index 8fb836bc3..9df7ce62f 100644 --- a/src/webui/static/app/tvheadend.js +++ b/src/webui/static/app/tvheadend.js @@ -99,8 +99,10 @@ tvheadend.PagingToolbarConf = function(conf, title, auto, count) conf.width = 50; conf.pageSize = 50; conf.displayInfo = true; + /// {0} start, {1} end, {2} total, {3} title conf.displayMsg = _('{3} {0} - {1} of {2}').replace('{3}', title); - conf.emptyMsg = String.format(_('No {0} to display'), title.toLowerCase()); + /// {0} title (lowercase), {1} title + conf.emptyMsg = String.format(_('No {0} to display'), title.toLowerCase(), title); conf.items = []; if (auto || count) conf.items.push('-');