C++11 tidying.

[dcpomatic.git] / i18n.py

diff --git a/i18n.py b/i18n.py
index 807aedda6b6d92444df48dabe63498a2cef1e4d4..a3589ff82747b9e84c54ba6a3536181d1b480b41 100644 (file)
--- a/i18n.py
+++ b/i18n.py
@@ -3,12 +3,12 @@ import os
 from waflib import Logs
 
 def command(c):
-    print c
+    print(c)
     os.system(c)
 
 def pot(dir, sources, name):
     s = ""
-    for f in sources.split('\n'):
+    for f in sources.split():
         t = f.strip()
         if len(t) > 0:
             s += (os.path.join(dir, t)) + " "
@@ -20,7 +20,7 @@ def pot(dir, sources, name):
     except:
         pass
 
-    command('xgettext -d %s -s --keyword=_ --add-comments=/ -p %s -o %s.pot %s' % (name, d, name, s))
+    command('xgettext --from-code=UTF-8 -d %s -s --keyword=_ --keyword=S_ --add-comments=/ -p %s -o %s.pot %s' % (name, d, name, s))
 
 def pot_merge(dir, name):
     for f in glob.glob(os.path.join(os.getcwd(), dir, 'po', '*.po')):
@@ -32,5 +32,5 @@ def po_to_mo(dir, name, bld):
         po = os.path.join('po', '%s.po' % lang)
         mo = os.path.join('mo', lang, '%s.mo' % name)
 
-        bld(rule = 'msgfmt -f ${SRC} -o ${TGT}', source = bld.path.make_node(po), target = bld.path.get_bld().make_node(mo))
+        bld(rule='msgfmt -c ${SRC} -o ${TGT}', source=bld.path.make_node(po), target=bld.path.get_bld().make_node(mo))
         bld.install_files(os.path.join('${PREFIX}', 'share', 'locale', lang, 'LC_MESSAGES'), mo)