Ticket #14824: 14824-patch.diff

trunk/django/utils/formats.py

@@ -17 +17 @@
     """
     Does the heavy lifting of finding format modules.
     """
-    if check_for_language(lang) or settings.USE_L10N:
+    if settings.USE_L10N and check_for_language(lang):
         format_locations = ['django.conf.locale.%s']
         if settings.FORMAT_MODULE_PATH:
             format_locations.append(settings.FORMAT_MODULE_PATH + '.%s')