Commit c54905b3 authored by Claude Paroz's avatar Claude Paroz
Browse files

Fixed #18479 -- Stopped makemessages raising error on gettext warnings 

Thanks Niels Busch for the initial patch.
parent d8e221db

django/core/management/commands/makemessages.py

+42 −24
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ from django.utils.text import get_text_list 
from django.utils.jslex import prepare_js_for_gettext



plural_forms_re = re.compile(r'^(?P<value>"Plural-Forms.+?\\n")\s*$', re.MULTILINE | re.DOTALL)

STATUS_OK = 0



def handle_extensions(extensions=('html',), ignored=('py',)):

    """
@@ -43,7 +44,8 @@ def _popen(cmd): 
    Friendly wrapper around Popen for Windows

    """

    p = Popen(cmd, shell=True, stdout=PIPE, stderr=PIPE, close_fds=os.name != 'nt', universal_newlines=True)

    return p.communicate()

    output, errors = p.communicate()

    return output, errors, p.returncode



def walk(root, topdown=True, onerror=None, followlinks=False,

         ignore_patterns=None, verbosity=0, stdout=sys.stdout):
@@ -198,8 +200,9 @@ def process_file(file, dirpath, potfile, domain, verbosity, 
            (domain, wrap, location, work_file))

    else:

        return

    msgs, errors = _popen(cmd)

    msgs, errors, status = _popen(cmd)

    if errors:

        if status != STATUS_OK:

            if is_templatized:

                os.unlink(work_file)

            if os.path.exists(potfile):
@@ -207,6 +210,9 @@ def process_file(file, dirpath, potfile, domain, verbosity, 
            raise CommandError(

                "errors happened while running xgettext on %s\n%s" %

                (file, errors))

        elif verbosity > 0:

            # Print warnings

            stdout.write(errors)

    if msgs:

        write_pot_file(potfile, msgs, orig_file, work_file, is_templatized)

    if is_templatized:
@@ -220,20 +226,28 @@ def write_po_file(pofile, potfile, domain, locale, verbosity, stdout, 


    Uses mguniq, msgmerge, and msgattrib GNU gettext utilities.

    """

    msgs, errors = _popen('msguniq %s %s --to-code=utf-8 "%s"' %

    msgs, errors, status = _popen('msguniq %s %s --to-code=utf-8 "%s"' %

                                    (wrap, location, potfile))

    if errors:

        if status != STATUS_OK:

            os.unlink(potfile)

        raise CommandError("errors happened while running msguniq\n%s" % errors)

            raise CommandError(

                "errors happened while running msguniq\n%s" % errors)

        elif verbosity > 0:

            stdout.write(errors)



    if os.path.exists(pofile):

        with open(potfile, 'w') as fp:

            fp.write(msgs)

        msgs, errors = _popen('msgmerge %s %s -q "%s" "%s"' %

        msgs, errors, status = _popen('msgmerge %s %s -q "%s" "%s"' %

                                        (wrap, location, pofile, potfile))

        if errors:

            if status != STATUS_OK:

                os.unlink(potfile)

                raise CommandError(

                    "errors happened while running msgmerge\n%s" % errors)

            elif verbosity > 0:

                stdout.write(errors)

    elif copy_pforms:

        msgs = copy_plural_forms(msgs, locale, domain, verbosity, stdout)

    msgs = msgs.replace(
@@ -242,11 +256,15 @@ def write_po_file(pofile, potfile, domain, locale, verbosity, stdout, 
        fp.write(msgs)

    os.unlink(potfile)

    if no_obsolete:

        msgs, errors = _popen('msgattrib %s %s -o "%s" --no-obsolete "%s"' %

        msgs, errors, status = _popen(

            'msgattrib %s %s -o "%s" --no-obsolete "%s"' %

            (wrap, location, pofile, pofile))

        if errors:

            if status != STATUS_OK:

                raise CommandError(

                    "errors happened while running msgattrib\n%s" % errors)

            elif verbosity > 0:

                stdout.write(errors)



def make_messages(locale=None, domain='django', verbosity=1, all=False,

        extensions=None, symlinks=False, ignore_patterns=None, no_wrap=False,
@@ -291,8 +309,8 @@ def make_messages(locale=None, domain='django', verbosity=1, all=False, 
        raise CommandError(message)



    # We require gettext version 0.15 or newer.

    output, errors = _popen('xgettext --version')

    if errors:

    output, errors, status = _popen('xgettext --version')

    if status != STATUS_OK:

        raise CommandError("Error running xgettext. Note that Django "

                    "internationalization requires GNU gettext 0.15 or newer.")

    match = re.search(r'(?P<major>\d+)\.(?P<minor>\d+)', output)

tests/regressiontests/i18n/commands/code.sample

0 → 100644
+4 −0
Original line number Diff line number Diff line 
from django.utils.translation import ugettext



# This will generate an xgettext warning

my_string = ugettext("This string contain two placeholders: %s and %s" % ('a', 'b'))

tests/regressiontests/i18n/commands/extraction.py

+8 −0
Original line number Diff line number Diff line
@@ -117,6 +117,14 @@ class BasicExtractorTests(ExtractorTests): 
        # Check that the temporary file was cleaned up

        self.assertFalse(os.path.exists('./templates/template_with_error.html.py'))



    def test_extraction_warning(self):

        os.chdir(self.test_dir)

        shutil.copyfile('./code.sample', './code_sample.py')

        stdout = StringIO()

        management.call_command('makemessages', locale=LOCALE, stdout=stdout)

        os.remove('./code_sample.py')

        self.assertIn("code_sample.py:4", stdout.getvalue())



    def test_template_message_context_extractor(self):

        """

        Ensure that message contexts are correctly extracted for the