Navigation

humanize

Timestamp:

11/29/07 23:50:44 (1 year ago)

Author:

jkocherhans

Message:

newforms-admin: Merged trunk revision [6671].

Files:

django/branches/newforms-admin
- Property svnmerge-integrated changed from /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-6655,6658-6670 to /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-6655,6658-6671

r6014	r6776
22	22	return u"%d%s" % (value, t[0])
23	23	return u'%d%s' % (value, t[value % 10])
	24	ordinal.is_safe = True
24	25	register.filter(ordinal)
25	26
…	…
35	36	else:
36	37	return intcomma(new)
	38	intcomma.is_safe = True
37	39	register.filter(intcomma)
38	40
…	…
56	58	return ungettext('%(value).1f trillion', '%(value).1f trillion', new_value) % {'value': new_value}
57	59	return value
	60	intword.is_safe = False
58	61	register.filter(intword)
59	62
…	…
70	73	return value
71	74	return (_('one'), _('two'), _('three'), _('four'), _('five'), _('six'), _('seven'), _('eight'), _('nine'))[value-1]
	75	apnumber.is_safe = True
72	76	register.filter(apnumber)
73	77