Ticket #6476: nowrap.patch

bin/make-messages.py

@@ -29 +29 @@
         print "you want to enable i18n for your project or application."
         sys.exit(1)
 
-    (opts, args) = getopt.getopt(sys.argv[1:], 'l:d:va')
+    (opts, args) = getopt.getopt(sys.argv[1:], 'l:d:vaw')
 
     lang = None
     domain = 'django'
     verbose = False
     all = False
+    nowrap = False
 
     for o, v in opts:
         if o == '-l':
@@ -45 +46 @@
             verbose = True
         elif o == '-a':
             all = True
+        elif o == '-w':
+            nowrap = True
 
     if domain not in ('django', 'djangojs'):
         print "currently make-messages.py only supports domains 'django' and 'djangojs'"
@@ -85 +88 @@
                 src = pythonize_re.sub('\n#', src)
                 open(os.path.join(dirpath, '%s.py' % file), "wb").write(src)
                 thefile = '%s.py' % file
-                cmd = 'xgettext %s -d %s -L Perl --keyword=gettext_noop --keyword=gettext_lazy --keyword=ngettext_lazy:1,2 --from-code UTF-8 -o - "%s"' % (
-                    os.path.exists(potfile) and '--omit-header' or '', domain, os.path.join(dirpath, thefile))
+                cmd = 'xgettext %s -d %s -L Perl %s --keyword=gettext_noop --keyword=gettext_lazy --keyword=ngettext_lazy:1,2 --from-code UTF-8 -o - "%s"' % (
+                    os.path.exists(potfile) and '--omit-header' or '', domain,
+                    nowrap and '--no-wrap' or '', os.path.join(dirpath, thefile))
                 (stdin, stdout, stderr) = os.popen3(cmd, 't')
                 msgs = stdout.read()
                 errors = stderr.read()
@@ -108 +112 @@
                     open(os.path.join(dirpath, thefile), "wb").write(templatize(src))
                 if verbose:
                     sys.stdout.write('processing file %s in %s\n' % (file, dirpath))
-                cmd = 'xgettext -d %s -L Python --keyword=gettext_noop --keyword=gettext_lazy --keyword=ngettext_lazy:1,2 --keyword=ugettext_noop --keyword=ugettext_lazy --keyword=ungettext_lazy:1,2 --from-code UTF-8 -o - "%s"' % (
-                    domain, os.path.join(dirpath, thefile))
+                cmd = 'xgettext -d %s -L Python %s --no-location --keyword=gettext_noop --keyword=gettext_lazy --keyword=ngettext_lazy:1,2 --keyword=ugettext_noop --keyword=ugettext_lazy --keyword=ungettext_lazy:1,2 --from-code UTF-8 -o - "%s"' % (
+                    domain, nowrap and '--no-wrap' or '', os.path.join(dirpath, thefile))
                 (stdin, stdout, stderr) = os.popen3(cmd, 't')
                 msgs = stdout.read()
                 errors = stderr.read()
@@ -132 +136 @@
                     os.unlink(os.path.join(dirpath, thefile))
 
         if os.path.exists(potfile):
-            (stdin, stdout, stderr) = os.popen3('msguniq --to-code=utf-8 "%s"' % potfile, 'b')
+            (stdin, stdout, stderr) = os.popen3('msguniq %s --to-code=utf-8 "%s"' % (
+                nowrap and '--no-wrap' or '', potfile), 'b')
             msgs = stdout.read()
             errors = stderr.read()
             if errors:
@@ -141 +146 @@
                 sys.exit(8)
             open(potfile, 'w').write(msgs)
             if os.path.exists(pofile):
-                (stdin, stdout, stderr) = os.popen3('msgmerge -q "%s" "%s"' % (pofile, potfile), 'b')
+                (stdin, stdout, stderr) = os.popen3('msgmerge %s -q "%s" "%s"' % (
+                    nowrap and '--no-wrap' or '', pofile, potfile), 'b')
                 msgs = stdout.read()
                 errors = stderr.read()
                 if errors: