Commit 115fd140 authored by Claude Paroz's avatar Claude Paroz
Browse files

Configure settings sooner in makemessages 

As get_text_list is using translations, setup settings before
calling it.
parent 8ca3963a

django/core/management/commands/makemessages.py

+4 −4
Original line number Diff line number Diff line
@@ -230,10 +230,6 @@ class Command(NoArgsCommand): 
            raise CommandError("Type '%s help %s' for usage information." % (

                os.path.basename(sys.argv[0]), sys.argv[1]))



        if self.verbosity > 1:

            self.stdout.write('examining files with the extensions: %s\n'

                             % get_text_list(list(self.extensions), 'and'))



        # Need to ensure that the i18n framework is enabled

        from django.conf import settings

        if settings.configured:
@@ -241,6 +237,10 @@ class Command(NoArgsCommand): 
        else:

            settings.configure(USE_I18N=True)



        if self.verbosity > 1:

            self.stdout.write('examining files with the extensions: %s\n'

                             % get_text_list(list(self.extensions), 'and'))



        self.invoked_for_django = False

        if os.path.isdir(os.path.join('conf', 'locale')):

            localedir = os.path.abspath(os.path.join('conf', 'locale'))