intl: add comments extraction for gettext (///)

diff --git a/Makefile b/Makefile
index 4cf276ec7c6056543857e2ace0ab988e766783e4..44a7fe05e983144becc99fa68fa819ef6d489398 100644 (file)
--- 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 538e79f1af66a49e783478ce69f7028fd2a6b46e..05d844ff742114c2b2b7c00798fb0b0fa154ac98 100644 (file)
--- 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 8fb836bc362c190bfca940224ccdf67463b9dfd4..9df7ce62f788f42a64b0589027ecb2773d211ced 100644 (file)
--- 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('-');