Changeset 7356

Timestamp:

03/24/08 08:27:19 (7 months ago)

Author:

mtredinnick

Message:

Fixed #6864 -- Handle Javascript i18n when the plural form expression returns
True or False (so both booleans and integers are allowed). Thanks, Ramiro Morales.

Files:

• django/trunk/django/views/i18n.py (modified) (2 diffs)

django/trunk/django/views/i18n.py

@@ -83 +83 @@
-"""
-
+PluralIdx = r"""
+function pluralidx(n) {
+  var v=%s;
+  if (typeof(v) == 'boolean') {
+    return v ? 1 : 0;
+  } else {
+    return v;
+  }
+}
+"""
+
-def null_javascript_catalog(request, domain=None, packages=None):
-    """
@@ -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;
-        plural = [el.strip() for el in plural.split(';') if el.strip().startswith('plural=')][0].split('=',1)[1]
-'function pluralidx(n) {\n    return %s;\n}\n'
+PluralIdx
-    else:
-        src.append(SimplePlural)