Changeset 755

Timestamp:

10/01/05 07:47:22 (3 years ago)

Author:

hugo

Message:

i18n now has support for ngettext and has unittests

Files:

• django/branches/i18n/django/core/defaulttags.py (modified) (2 diffs)
• django/branches/i18n/django/utils/translation.py (modified) (1 diff)
• django/branches/i18n/tests/othertests/templates.py (modified) (4 diffs)

django/branches/i18n/django/core/defaulttags.py

@@ -292 +292 @@
-        self.cmd = cmd
-        self.i18n_re = re.compile(r'^\s*_\((.*)\)\s*$')
+        self.ngettext_re = re.compile(r'''^\s*ngettext\(((?:".+")|(?:'.+')|(?:""".+"""))\s*,\s*((?:".+")|(?:'.+')|(?:""".+"""))\s*,\s*(.*)\)\s*$''')
+
+    def _resolve_var(self, s, context):
+        if s.startswith("'") and s.endswith("'"):
+            s = s[1:-1]
+        elif s.startswith('"""') and s.endswith('"""'):
+            s = s[3:-3]
+        elif s.startswith('"') and s.endswith('"'):
+            s = s[1:-1]
+        else:
+            s = template.resolve_variable_with_filters(s, context)
+        return s
-
-    def render(self, context):
-        m = self.i18n_re.match(self.cmd)
-        if m:
-
-
-
-
-
-
-
-
-
+
-            return translation.gettext(s) % context
-
-
+
+
+
+
+
+
+
-
-def do_comment(parser, token):
@@ -779 +788 @@
-
-        {% i18n _('test') %}
+        {% i18n ngettext('singular', 'plural', counter) %}
-
-    """

django/branches/i18n/django/utils/translation.py

@@ -149 +149 @@
-    """
-    return message
+
+def ngettext(singular, plural, number):
+    """
+    This function returns the translation of either the singular
+    or plural, based on the number.
+    """
+    if number == 1: return gettext(singular)
+    else: return gettext(plural)
-
-def get_language_from_request(request):

django/branches/i18n/tests/othertests/templates.py

@@ -1 +1 @@
-from django.core import template, template_loader
+from django.utils.translation import activate, deactivate
-
-# Helper objects for template tests
@@ -211 +212 @@
-    # Raise exception for custom tags used in child with {% load %} tag in parent, not in child
-    'exception04': ("{% extends 'inheritance17' %}{% block first %}{% echo 400 %}5678{% endblock %}", {}, template.TemplateSyntaxError),
+
+    # simple translation of a string delimited by '
+    'i18n01': ("{% i18n _('xxxyyyxxx') %}", {}, "xxxyyyxxx"),
+
+    # simple translation of a string delimited by "
+    'i18n02': ('{% i18n _("xxxyyyxxx") %}', {}, "xxxyyyxxx"),
+
+    # simple translation of a string delimited by """
+    'i18n03': ('{% i18n _("""xxxyyyxxx""") %}', {}, "xxxyyyxxx"),
+
+    # simple translation of a variable
+    'i18n04': ('{% i18n _(anton) %}', {'anton': 'xxxyyyxxx'}, "xxxyyyxxx"),
+
+    # simple translation of a variable
+    'i18n05': ('{% i18n _(anton|lower) %}', {'anton': 'XXXYYYXXX'}, "xxxyyyxxx"),
+
+    # simple translation of a string with interpolation
+    'i18n05': ('{% i18n _("xxx%(anton)sxxx") %}', {'anton': 'yyy'}, "xxxyyyxxx"),
+
+    # simple translation of a string to german
+    'i18n07': ('{% i18n _("Page not found") %}', {'LANGUAGE_CODE': 'de'}, "Seite nicht gefunden"),
+
+    # translation of singular form
+    'i18n08': ('{% i18n ngettext("singular", "plural", count) %}', {'count': 1}, "singular"),
+
+    # translation of plural form
+    'i18n09': ('{% i18n ngettext("singular", "plural", count) %}', {'count': 2}, "plural"),
-}
-
@@ -226 +254 @@
-    tests.sort()
-    for name, vals in tests:
+        if 'LANGUAGE_CODE' in vals[1]:
+            activate('*', vals[1]['LANGUAGE_CODE'])
-        try:
-            output = template_loader.get_template(name).render(template.Context(vals[1]))
@@ -237 +267 @@
-                failed_tests.append(name)
-            continue
+        if 'LANGUAGE_CODE' in vals[1]:
+            deactivate()
-        if output == vals[2]:
-            if verbosity: