Commit 08e1c79f authored by Gagaro's avatar Gagaro Committed by Tim Graham
Browse files

[1.9.x] Fixed #25812 -- Restored the ability to use custom formats with the date template filter. 

Backport of 34d88944 from master
parent b5ff75da

AUTHORS

+1 −0
Original line number Diff line number Diff line
@@ -746,6 +746,7 @@ answer newbie questions, and generally made Django that much better: 
    Wilson Miner <wminer@gmail.com>

    wojtek

    Xia Kai <http://blog.xiaket.org/>

    Yann Fouillat <gagaro42@gmail.com>

    Yann Malet

    Yasushi Masuda <whosaysni@gmail.com>

    ye7cakf02@sneakemail.com

django/utils/formats.py

+3 −5
Original line number Diff line number Diff line
@@ -110,8 +110,6 @@ def get_format(format_type, lang=None, use_l10n=None): 
    be localized (or not), overriding the value of settings.USE_L10N.

    """

    format_type = force_str(format_type)

    if format_type not in FORMAT_SETTINGS:

        return format_type

    if use_l10n or (use_l10n is None and settings.USE_L10N):

        if lang is None:

            lang = get_language()
@@ -120,9 +118,6 @@ def get_format(format_type, lang=None, use_l10n=None): 
            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:
@@ -137,6 +132,9 @@ def get_format(format_type, lang=None, use_l10n=None): 
                except AttributeError:

                    pass

            _format_cache[cache_key] = None

    if format_type not in FORMAT_SETTINGS:

        return format_type

    # Return the general setting by default

    return getattr(settings, format_type)



get_format_lazy = lazy(get_format, six.text_type, list, tuple)

docs/releases/1.8.8.txt

+4 −0
Original line number Diff line number Diff line
@@ -14,3 +14,7 @@ Bugfixes 


* Corrected ``__len`` query lookup on ``ArrayField`` for empty arrays

  (:ticket:`25772`).



* Restored the ability to use custom formats from ``formats.py`` with

  ``django.utils.formats.get_format()`` and the ``date`` template filter

  (:ticket:`25812`).

docs/topics/i18n/formatting.txt

+4 −1
Original line number Diff line number Diff line
@@ -170,7 +170,10 @@ the package where format files will exist, for instance:: 
    ]



Files are not placed directly in this directory, but in a directory named as

the locale, and must be named ``formats.py``.

the locale, and must be named ``formats.py``. Be careful not to put sensitive

information in these files as values inside can be exposed if you pass the

string to ``django.utils.formats.get_format()`` (used by the :tfilter:`date`

template filter).



To customize the English formats, a structure like this would be needed::

tests/i18n/other/locale/fr/__init__.py

0 → 100644
+0 −0

Empty file added.