X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=po%2Fpostats.py;h=bca7380af9c7ae8f66621df5e3dd40cf9840ea79;hb=0d84f0b9fdfce831e39676307bc954f7389198d1;hp=52690967da5f24758f209f8aa1cdb407ff1955a5;hpb=f83c5eab77f4f2c57ff8d05496468f5f1e9007b3;p=lyx.git

diff --git a/po/postats.py b/po/postats.py
index 52690967da..bca7380af9 100755
--- a/po/postats.py
+++ b/po/postats.py
@@ -38,6 +38,7 @@ ommitted = ('en.po')
 import os
 import sys
 import codecs
+import subprocess
 from subprocess import Popen, PIPE
 
 # Reset the locale
@@ -112,17 +113,14 @@ def run_msgfmt(pofile):
     prop["email"] = header['Last-Translator'].split('<')[1][:-1]
     prop["email"] = prop["email"].replace("@", " () ")
     prop["email"] = prop["email"].replace(".", " ! ")
-    translator = header['Last-Translator'].split('<')[0].strip()
-    try:
-        prop["translator"] = translator.encode('ascii','xmlcharrefreplace')
-    except LookupError:
-        prop["translator"] = translator
-
-    P = Popen("msgfmt --statistics -o %s %s" % (gmofile, pofile),
-              shell=True, stdin=PIPE, stdout=PIPE, close_fds=True)
-    extract_number(P.stdout.readline().decode(),
-                   ('translated', 'fuzzy', 'untranslated'),
-                   prop)
+    prop["translator"] = header['Last-Translator'].split('<')[0].strip()
+
+    msg = subprocess.check_output(["msgfmt", "--statistics",
+            "-o", gmofile, # FIXME: do we really want a gmofile as side-effect?
+            pofile], stderr=subprocess.STDOUT)
+    if sys.version_info[0] > 2:
+        msg = msg.decode('utf8')
+    extract_number(msg, ('translated', 'fuzzy', 'untranslated'), prop)
     return """
 array ( 'langcode' => '%(langcode)s', "date" => "%(date)s",
 "msg_tr" => %(translated)d, "msg_fu" => %(fuzzy)d, "msg_nt" => %(untranslated)d,
@@ -144,4 +142,6 @@ $branch_tag = "%s";
 
 // The data itself
 $podata = array (%s
-)?>""" % (sys.argv[1], branch_tag, ",".join([run_msgfmt(po) for po in sys.argv[2:] if po not in ommitted])))
+)?>""" % (sys.argv[1], branch_tag, 
+          ",".join([run_msgfmt(po) for po in sys.argv[2:] 
+                                   if po not in ommitted])))