mirror of
https://github.com/django/django.git
synced 2025-11-24 21:00:12 +00:00
Fixed #16878 -- Improved intword filter to support numbers up to decillion and googol. Thanks to crodjer for the initial patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16897 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jannis Leidel
parent
33ad413c1c
commit
6cae2a550d
6 changed files with 225 additions and 71 deletions
|
|
@ -1,160 +0,0 @@
|
|||
from __future__ import with_statement
|
||||
from datetime import timedelta, date, datetime, tzinfo
|
||||
|
||||
from django.template import Template, Context, add_to_builtins, defaultfilters
|
||||
from django.test import TestCase
|
||||
from django.utils import translation, tzinfo
|
||||
from django.utils.translation import ugettext as _
|
||||
from django.utils.html import escape
|
||||
|
||||
add_to_builtins('django.contrib.humanize.templatetags.humanize')
|
||||
|
||||
|
||||
class HumanizeTests(TestCase):
|
||||
|
||||
def humanize_tester(self, test_list, result_list, method):
|
||||
# Using max below ensures we go through both lists
|
||||
# However, if the lists are not equal length, this raises an exception
|
||||
for test_content, result in zip(test_list, result_list):
|
||||
t = Template('{{ test_content|%s }}' % method)
|
||||
rendered = t.render(Context(locals())).strip()
|
||||
self.assertEqual(rendered, escape(result),
|
||||
msg="%s test failed, produced '%s', should've produced '%s'" % (method, rendered, result))
|
||||
|
||||
def test_ordinal(self):
|
||||
test_list = ('1','2','3','4','11','12',
|
||||
'13','101','102','103','111',
|
||||
'something else', None)
|
||||
result_list = ('1st', '2nd', '3rd', '4th', '11th',
|
||||
'12th', '13th', '101st', '102nd', '103rd',
|
||||
'111th', 'something else', None)
|
||||
|
||||
self.humanize_tester(test_list, result_list, 'ordinal')
|
||||
|
||||
def test_intcomma(self):
|
||||
test_list = (100, 1000, 10123, 10311, 1000000, 1234567.25,
|
||||
'100', '1000', '10123', '10311', '1000000', '1234567.1234567',
|
||||
None)
|
||||
result_list = ('100', '1,000', '10,123', '10,311', '1,000,000', '1,234,567.25',
|
||||
'100', '1,000', '10,123', '10,311', '1,000,000', '1,234,567.1234567',
|
||||
None)
|
||||
|
||||
self.humanize_tester(test_list, result_list, 'intcomma')
|
||||
|
||||
def test_l10n_intcomma(self):
|
||||
test_list = (100, 1000, 10123, 10311, 1000000, 1234567.25,
|
||||
'100', '1000', '10123', '10311', '1000000', '1234567.1234567',
|
||||
None)
|
||||
result_list = ('100', '1,000', '10,123', '10,311', '1,000,000', '1,234,567.25',
|
||||
'100', '1,000', '10,123', '10,311', '1,000,000', '1,234,567.1234567',
|
||||
None)
|
||||
|
||||
with self.settings(USE_L10N=True, USE_THOUSAND_SEPARATOR=False):
|
||||
self.humanize_tester(test_list, result_list, 'intcomma')
|
||||
|
||||
def test_intword(self):
|
||||
test_list = ('100', '1000000', '1200000', '1290000',
|
||||
'1000000000', '2000000000', '6000000000000',
|
||||
None)
|
||||
result_list = ('100', '1.0 million', '1.2 million', '1.3 million',
|
||||
'1.0 billion', '2.0 billion', '6.0 trillion',
|
||||
None)
|
||||
self.humanize_tester(test_list, result_list, 'intword')
|
||||
|
||||
def test_i18n_intcomma(self):
|
||||
test_list = (100, 1000, 10123, 10311, 1000000, 1234567.25,
|
||||
'100', '1000', '10123', '10311', '1000000', None)
|
||||
result_list = ('100', '1.000', '10.123', '10.311', '1.000.000', '1.234.567,25',
|
||||
'100', '1.000', '10.123', '10.311', '1.000.000', None)
|
||||
with self.settings(USE_L10N=True, USE_THOUSAND_SEPARATOR=True):
|
||||
with translation.override('de'):
|
||||
self.humanize_tester(test_list, result_list, 'intcomma')
|
||||
|
||||
def test_i18n_intword(self):
|
||||
test_list = ('100', '1000000', '1200000', '1290000',
|
||||
'1000000000','2000000000','6000000000000')
|
||||
result_list = ('100', '1,0 Million', '1,2 Millionen', '1,3 Millionen',
|
||||
'1,0 Milliarde', '2,0 Milliarden', '6,0 Billionen')
|
||||
with self.settings(USE_L10N=True, USE_THOUSAND_SEPARATOR=True):
|
||||
with translation.override('de'):
|
||||
self.humanize_tester(test_list, result_list, 'intword')
|
||||
|
||||
def test_apnumber(self):
|
||||
test_list = [str(x) for x in range(1, 11)]
|
||||
test_list.append(None)
|
||||
result_list = (u'one', u'two', u'three', u'four', u'five', u'six',
|
||||
u'seven', u'eight', u'nine', u'10', None)
|
||||
|
||||
self.humanize_tester(test_list, result_list, 'apnumber')
|
||||
|
||||
def test_naturalday(self):
|
||||
today = date.today()
|
||||
yesterday = today - timedelta(days=1)
|
||||
tomorrow = today + timedelta(days=1)
|
||||
someday = today - timedelta(days=10)
|
||||
notdate = u"I'm not a date value"
|
||||
|
||||
test_list = (today, yesterday, tomorrow, someday, notdate, None)
|
||||
someday_result = defaultfilters.date(someday)
|
||||
result_list = (_(u'today'), _(u'yesterday'), _(u'tomorrow'),
|
||||
someday_result, u"I'm not a date value", None)
|
||||
self.humanize_tester(test_list, result_list, 'naturalday')
|
||||
|
||||
def test_naturalday_tz(self):
|
||||
from django.contrib.humanize.templatetags.humanize import naturalday
|
||||
|
||||
today = date.today()
|
||||
tz_one = tzinfo.FixedOffset(timedelta(hours=-12))
|
||||
tz_two = tzinfo.FixedOffset(timedelta(hours=12))
|
||||
|
||||
# Can be today or yesterday
|
||||
date_one = datetime(today.year, today.month, today.day, tzinfo=tz_one)
|
||||
naturalday_one = naturalday(date_one)
|
||||
# Can be today or tomorrow
|
||||
date_two = datetime(today.year, today.month, today.day, tzinfo=tz_two)
|
||||
naturalday_two = naturalday(date_two)
|
||||
|
||||
# As 24h of difference they will never be the same
|
||||
self.assertNotEqual(naturalday_one, naturalday_two)
|
||||
|
||||
def test_naturaltime(self):
|
||||
now = datetime.now()
|
||||
test_list = [
|
||||
now,
|
||||
now - timedelta(seconds=1),
|
||||
now - timedelta(seconds=30),
|
||||
now - timedelta(minutes=1, seconds=30),
|
||||
now - timedelta(minutes=2),
|
||||
now - timedelta(hours=1, minutes=30, seconds=30),
|
||||
now - timedelta(hours=23, minutes=50, seconds=50),
|
||||
now - timedelta(days=1),
|
||||
now - timedelta(days=500),
|
||||
now + timedelta(seconds=1),
|
||||
now + timedelta(seconds=30),
|
||||
now + timedelta(minutes=1, seconds=30),
|
||||
now + timedelta(minutes=2),
|
||||
now + timedelta(hours=1, minutes=30, seconds=30),
|
||||
now + timedelta(hours=23, minutes=50, seconds=50),
|
||||
now + timedelta(days=1),
|
||||
now + timedelta(days=500),
|
||||
]
|
||||
result_list = [
|
||||
'now',
|
||||
'a second ago',
|
||||
'30 seconds ago',
|
||||
'a minute ago',
|
||||
'2 minutes ago',
|
||||
'an hour ago',
|
||||
'23 hours ago',
|
||||
'1 day ago',
|
||||
'1 year, 4 months ago',
|
||||
'a second from now',
|
||||
'30 seconds from now',
|
||||
'a minute from now',
|
||||
'2 minutes from now',
|
||||
'an hour from now',
|
||||
'23 hours from now',
|
||||
'1 day from now',
|
||||
'1 year, 4 months from now',
|
||||
]
|
||||
self.humanize_tester(test_list, result_list, 'naturaltime')
|
||||
Loading…
Add table
Add a link
Reference in a new issue