Navigation

i18n.py

Timestamp:

03/29/08 02:40:20 (9 months ago)

Author:

jkocherhans

Message:

newforms-admin: Merged from trunk up to [7377].

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-7350 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-7377

r7233	r7378
83	83	"""
84	84
	85	PluralIdx = r"""
	86	function pluralidx(n) {
	87	var v=%s;
	88	if (typeof(v) == 'boolean') {
	89	return v ? 1 : 0;
	90	} else {
	91	return v;
	92	}
	93	}
	94	"""
	95
85	96	def null_javascript_catalog(request, domain=None, packages=None):
86	97	"""
…	…
155	166	# Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 \|\| n%100>=20) ? 1 : 2;
156	167	plural = [el.strip() for el in plural.split(';') if el.strip().startswith('plural=')][0].split('=',1)[1]
157		src.append(~~'function pluralidx(n) {\n return %s;\n}\n'~~ % plural)
	168	src.append(PluralIdx % plural)
158	169	else:
159	170	src.append(SimplePlural)