Commit 25f2cfb7 authored by Malcolm Tredinnick's avatar Malcolm Tredinnick
Browse files

Fixed #7643 -- Fixed an oversight from [7844]. 

Now makemessages works in projects again. Based on a patch from Horst Gutmann.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7848 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 075098f9

django/conf/__init__.py

+7 −0
Original line number Diff line number Diff line
@@ -71,6 +71,13 @@ class LazySettings(object): 
            setattr(holder, name, value)

        self._target = holder



    def configured(self):

        """

        Returns True if the settings have already been configured.

        """

        return bool(self._target)

    configured = property(configured)



class Settings(object):

    def __init__(self, settings_module):

        # update this dict from global settings (but only for ALL_CAPS settings)

django/core/management/commands/makemessages.py

+7 −4
Original line number Diff line number Diff line
@@ -14,6 +14,9 @@ def make_messages(locale=None, domain='django', verbosity='1', all=False): 
    """

    # Need to ensure that the i18n framework is enabled

    from django.conf import settings

    if settings.configured:

        settings.USE_I18N = True

    else:

        settings.configure(USE_I18N = True)



    from django.utils.translation import templatize