diff --git a/constance/admin.py b/constance/admin.py index f6579a0..f830bf2 100644 --- a/constance/admin.py +++ b/constance/admin.py @@ -14,6 +14,7 @@ from django.shortcuts import render_to_response from django.template.context import RequestContext from django.utils import six from django.utils.formats import localize +from django.utils.functional import SimpleLazyObject from django.utils.translation import ugettext_lazy as _ try: @@ -30,7 +31,7 @@ except ImportError: # Django < 1.4 from . import settings from .base import Config as ConfigClass -config = ConfigClass() +config = SimpleLazyObject(ConfigClass) NUMERIC_WIDGET = forms.TextInput(attrs={'size': 10}) diff --git a/constance/apps.py b/constance/apps.py index 3ebf1bb..89fd6c6 100644 --- a/constance/apps.py +++ b/constance/apps.py @@ -1,5 +1,7 @@ from django.apps import AppConfig from django.utils.translation import ugettext_lazy as _ +from django.utils.functional import SimpleLazyObject + from .base import Config @@ -10,4 +12,4 @@ class ConstanceConfig(AppConfig): def ready(self): super(ConstanceConfig, self).ready() - self.module.config = Config() + self.module.config = SimpleLazyObject(Config)