Fixed 16938 -- Ensured that the active locale's formats take precedence over the default settings even if they would be interpreted as False in a conditional test (e.g. 0 or empty string). Thanks to pikerr for the report and initial patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17017 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 6 insertions, 1 deletions

diff --git a/django/utils/formats.py b/django/utils/formats.py
index 3babccb0a0..e283490b17 100644
--- a/django/utils/formats.py
+++ b/django/utils/formats.py
@@ -71,7 +71,12 @@ def get_format(format_type, lang=None, use_l10n=None):
             lang = get_language()
         cache_key = (format_type, lang)
         try:
-            return _format_cache[cache_key] or getattr(settings, format_type)
+            cached = _format_cache[cache_key]
+            if cached is not None:
+                return cached
+            else:
+                # Return the general setting by default
+                return getattr(settings, format_type)
         except KeyError:
             for module in get_format_modules(lang):
                 try: