From 6fdcc3c85f26ef15feae673a94ee651308bc6bd0 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 23 Feb 2016 15:14:34 +0530
Subject: [PATCH] Use builtin RS compiler for generating POT files

---
 setup/translations.py            | 11 +++++------
 src/calibre/utils/rapydscript.py |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/setup/translations.py b/setup/translations.py
index 4ee0ef064a..0664d5d677 100644
--- a/setup/translations.py
+++ b/setup/translations.py
@@ -86,12 +86,11 @@ class POT(Command):  # {{{
 
     def get_content_server_strings(self):
         self.info('Generating translation template for content_server')
-        pottext = subprocess.check_output([
-            'rapydscript', 'gettext', '--package-name', __appname__, '--package-version', __version__,
-            '--bug-address', 'https://bugs.launchpad.net/calibre', self.j(self.SRC, 'pyj')
-        ])
-        tbase = self.j(self.TRANSLATIONS, 'content-server')
-        dest = self.j(tbase, 'content-server.pot')
+        from calibre import walk
+        from calibre.utils.rapydscript import create_pot
+        files = (f for f in walk(self.j(self.SRC, 'pyj')) if f.endswith('.pyj'))
+        pottext = create_pot(files).encode('utf-8')
+        dest = self.j(self.TRANSLATIONS, 'content-server', 'content-server.pot')
         with open(dest, 'wb') as f:
             f.write(pottext)
         self.upload_pot(dest, resource='content_server')
diff --git a/src/calibre/utils/rapydscript.py b/src/calibre/utils/rapydscript.py
index 339694dd69..d898ff7809 100644
--- a/src/calibre/utils/rapydscript.py
+++ b/src/calibre/utils/rapydscript.py
@@ -117,7 +117,7 @@ def create_pot(source_files):
     ctx.g.gettext_options = {
         'package_name': __appname__,
         'package_version': __version__,
-        'bugs_address': 'kovid@kovidgoyal.net'
+        'bugs_address': 'https://bugs.launchpad.net/calibre'
     }
     ctx.eval('catalog = {}')
     for fname in source_files: