Fixed #27034 -- Made makemessages independent of USE_I18N

Thanks Tim Graham for the review.

django/core/management/commands/makemessages.py

@@ -21,6 +21,7 @@ from django.utils.encoding import DEFAULT_LOCALE_ENCODING, force_str
 from django.utils.functional import cached_property
 from django.utils.jslex import prepare_js_for_gettext
 from django.utils.text import get_text_list
+from django.utils.translation import templatize
 
 plural_forms_re = re.compile(r'^(?P<value>"Plural-Forms.+?\\n")\s*$', re.MULTILINE | re.DOTALL)
 STATUS_OK = 0
@@ -99,8 +100,6 @@ class BuildFile(object):
         Preprocess (if necessary) a translatable file before passing it to
         xgettext GNU gettext utility.
         """
-        from django.utils.translation import templatize
-
         if not self.is_templatized:
             return
 
@@ -277,12 +276,6 @@ class Command(BaseCommand):
         extensions = options['extensions']
         self.symlinks = options['symlinks']
 
-        # Need to ensure that the i18n framework is enabled
-        if settings.configured:
-            settings.USE_I18N = True
-        else:
-            settings.configure(USE_I18N=True)
-
         ignore_patterns = options['ignore_patterns']
         if options['use_default_ignore_patterns']:
             ignore_patterns += ['CVS', '.*', '*~', '*.pyc']

django/utils/translation/__init__.py

@@ -211,7 +211,8 @@ def get_language_from_path(path):
 
 
 def templatize(src, origin=None):
-    return _trans.templatize(src, origin)
+    from .template import templatize
+    return templatize(src, origin)
 
 
 def deactivate_all():

tests/i18n/test_extraction.py

@@ -135,6 +135,19 @@ class ExtractorTests(POFileAssertionMixin, RunInTmpDirMixin, SimpleTestCase):
 
 class BasicExtractorTests(ExtractorTests):
 
+    @override_settings(USE_I18N=False)
+    def test_use_i18n_false(self):
+        """
+        makemessages also runs successfully when USE_I18N is False.
+        """
+        management.call_command('makemessages', locale=[LOCALE], verbosity=0)
+        self.assertTrue(os.path.exists(self.PO_FILE))
+        with io.open(self.PO_FILE, 'r', encoding='utf-8') as fp:
+            po_contents = fp.read()
+            # Check two random strings
+            self.assertIn('#. Translators: One-line translator comment #1', po_contents)
+            self.assertIn('msgctxt "Special trans context #1"', po_contents)
+
     def test_comments_extractor(self):
         management.call_command('makemessages', locale=[LOCALE], verbosity=0)
         self.assertTrue(os.path.exists(self.PO_FILE))