From 676bd084f2509f4201561d5c77ed4ecbd157bfa0 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Thu, 9 Sep 2021 07:42:05 +0200 Subject: Fixed #32873 -- Deprecated settings.USE_L10N. Co-authored-by: Mariusz Felisiak --- django/utils/formats.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'django/utils') diff --git a/django/utils/formats.py b/django/utils/formats.py index cffbb34398..781d334a8e 100644 --- a/django/utils/formats.py +++ b/django/utils/formats.py @@ -104,7 +104,11 @@ def get_format(format_type, lang=None, use_l10n=None): If use_l10n is provided and is not None, it forces the value to be localized (or not), overriding the value of settings.USE_L10N. """ - use_l10n = use_l10n or (use_l10n is None and settings.USE_L10N) + use_l10n = use_l10n or (use_l10n is None and ( + settings._USE_L10N_INTERNAL + if hasattr(settings, '_USE_L10N_INTERNAL') + else settings.USE_L10N + )) if use_l10n and lang is None: lang = get_language() cache_key = (format_type, lang) @@ -168,7 +172,11 @@ def number_format(value, decimal_pos=None, use_l10n=None, force_grouping=False): If use_l10n is provided and is not None, it forces the value to be localized (or not), overriding the value of settings.USE_L10N. """ - use_l10n = use_l10n or (use_l10n is None and settings.USE_L10N) + use_l10n = use_l10n or (use_l10n is None and ( + settings._USE_L10N_INTERNAL + if hasattr(settings, '_USE_L10N_INTERNAL') + else settings.USE_L10N + )) lang = get_language() if use_l10n else None return numberformat.format( value, -- cgit v1.3