From 25f2cfb7cbce2ea1e7547a55b01d16896039c44b Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Sun, 6 Jul 2008 12:55:24 +0000 Subject: [PATCH] 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 --- django/conf/__init__.py | 7 +++++++ django/core/management/commands/makemessages.py | 11 +++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/django/conf/__init__.py b/django/conf/__init__.py index 61d9ff7536..558eec0c9d 100644 --- a/django/conf/__init__.py +++ b/django/conf/__init__.py @@ -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) diff --git a/django/core/management/commands/makemessages.py b/django/core/management/commands/makemessages.py index bb364d4289..5be4b7adba 100644 --- a/django/core/management/commands/makemessages.py +++ b/django/core/management/commands/makemessages.py @@ -10,12 +10,15 @@ pythonize_re = re.compile(r'\n\s*//') def make_messages(locale=None, domain='django', verbosity='1', all=False): """ Uses the locale directory from the Django SVN tree or an application/ - project to process all + project to process all """ # Need to ensure that the i18n framework is enabled from django.conf import settings - settings.configure(USE_I18N = True) - + if settings.configured: + settings.USE_I18N = True + else: + settings.configure(USE_I18N = True) + from django.utils.translation import templatize if os.path.isdir(os.path.join('conf', 'locale')): @@ -24,7 +27,7 @@ def make_messages(locale=None, domain='django', verbosity='1', all=False): localedir = os.path.abspath('locale') else: raise CommandError("This script should be run from the Django SVN tree or your project or app tree. If you did indeed run it from the SVN checkout or your project or application, maybe you are just missing the conf/locale (in the django tree) or locale (for project and application) directory? It is not created automatically, you have to create it by hand if you want to enable i18n for your project or application.") - + if domain not in ('django', 'djangojs'): raise CommandError("currently makemessages only supports domains 'django' and 'djangojs'")