Author: jezdez Date: 2011-09-08 06:25:11 -0700 (Thu, 08 Sep 2011) New Revision: 16726
Modified: django/trunk/django/contrib/humanize/templatetags/humanize.py django/trunk/django/utils/formats.py django/trunk/django/utils/numberformat.py Log: Fixed #16404 -- Fixed a regression in the localization changes in the humanize app made in r16168. Thanks, [email protected]. Modified: django/trunk/django/contrib/humanize/templatetags/humanize.py =================================================================== --- django/trunk/django/contrib/humanize/templatetags/humanize.py 2011-09-08 13:25:00 UTC (rev 16725) +++ django/trunk/django/contrib/humanize/templatetags/humanize.py 2011-09-08 13:25:11 UTC (rev 16726) @@ -41,7 +41,7 @@ except (TypeError, ValueError): return intcomma(value, False) else: - return number_format(value) + return number_format(value, force_grouping=True) orig = force_unicode(value) new = re.sub("^(-?\d+)(\d{3})", '\g<1>,\g<2>', orig) if orig == new: Modified: django/trunk/django/utils/formats.py =================================================================== --- django/trunk/django/utils/formats.py 2011-09-08 13:25:00 UTC (rev 16725) +++ django/trunk/django/utils/formats.py 2011-09-08 13:25:11 UTC (rev 16726) @@ -103,7 +103,7 @@ """ return dateformat.time_format(value, get_format(format or 'TIME_FORMAT', use_l10n=use_l10n)) -def number_format(value, decimal_pos=None, use_l10n=None): +def number_format(value, decimal_pos=None, use_l10n=None, force_grouping=False): """ Formats a numeric value using localization settings @@ -120,6 +120,7 @@ decimal_pos, get_format('NUMBER_GROUPING', lang, use_l10n=use_l10n), get_format('THOUSAND_SEPARATOR', lang, use_l10n=use_l10n), + force_grouping=force_grouping ) def localize(value, use_l10n=None): Modified: django/trunk/django/utils/numberformat.py =================================================================== --- django/trunk/django/utils/numberformat.py 2011-09-08 13:25:00 UTC (rev 16725) +++ django/trunk/django/utils/numberformat.py 2011-09-08 13:25:11 UTC (rev 16726) @@ -2,7 +2,7 @@ from django.utils.safestring import mark_safe -def format(number, decimal_sep, decimal_pos=None, grouping=0, thousand_sep=''): +def format(number, decimal_sep, decimal_pos=None, grouping=0, thousand_sep='', force_grouping=False): """ Gets a number (as a number or string), and returns it as a string, using formats definied as arguments: @@ -13,7 +13,7 @@ * thousand_sep: Thousand separator symbol (for example ",") """ - use_grouping = settings.USE_L10N and \ + use_grouping = force_grouping or settings.USE_L10N and \ settings.USE_THOUSAND_SEPARATOR and grouping # Make the common case fast: if isinstance(number, int) and not use_grouping and not decimal_pos: -- You received this message because you are subscribed to the Google Groups "Django updates" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/django-updates?hl=en.
