p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Malcolm Tredinnick 2008-07-06 12:55:24 +00:00
parent 075098f9fd
commit 25f2cfb7cb
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
django/conf/__init__.py
View File

@ -71,6 +71,13 @@ class LazySettings(object):
setattr(holder, name, value) setattr(holder, name, value)
self._target = holder 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): class Settings(object):
def __init__(self, settings_module): def __init__(self, settings_module):
# update this dict from global settings (but only for ALL_CAPS settings) # update this dict from global settings (but only for ALL_CAPS settings)

3
django/core/management/commands/makemessages.py
View File

@ -14,6 +14,9 @@ def make_messages(locale=None, domain='django', verbosity='1', all=False):
""" """
# Need to ensure that the i18n framework is enabled # Need to ensure that the i18n framework is enabled
from django.conf import settings from django.conf import settings
if settings.configured:
settings.USE_I18N = True
else:
settings.configure(USE_I18N = True) settings.configure(USE_I18N = True)
from django.utils.translation import templatize from django.utils.translation import templatize