Changeset 7848

Timestamp:

07/06/08 07:55:24 (5 months ago)

Author:

mtredinnick

Message:

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

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

Files:

• django/trunk/django/conf/__init__.py (modified) (1 diff)
• django/trunk/django/core/management/commands/makemessages.py (modified) (2 diffs)

django/trunk/django/conf/__init__.py

@@ -72 +72 @@
-        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):

django/trunk/django/core/management/commands/makemessages.py

@@ -11 +11 @@
-    """
-    Uses the locale directory from the Django SVN tree or an application/
- 
+
-    """
-    # Need to ensure that the i18n framework is enabled
-    from django.conf import settings
-
-
+
+
+
+
+
-    from django.utils.translation import templatize
-
@@ -25 +28 @@
-    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'")