Changeset 1064

Timestamp:

11/03/05 10:07:43 (3 years ago)

Author:

hugo

Message:

i18n: updated unittests and fixed bugs in the tags, removed the old tags and fixed #719 (thx nesh)

Files:

• django/branches/i18n/django/core/template/defaulttags.py (modified) (3 diffs)
• django/branches/i18n/django/templatetags/i18n.py (modified) (5 diffs)
• django/branches/i18n/tests/othertests/templates.py (modified) (1 diff)

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

@@ -291 +291 @@
-        return str(int(round(ratio)))
-
-class GetAvailableLanguagesNode(Node):
-
-    def __init__(self, variable):
-        self.variable = variable
-
-    def render(self, context):
-        from django.conf.settings import LANGUAGES
-        context[self.variable] = LANGUAGES
-        return ''
-
-class I18NNode(Node):
-
-    def __init__(self, cmd):
-        self.cmd = cmd
-        self.i18n_re = re.compile(r'^\s*(_|gettext|gettext_noop)\((.*)\)\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 = resolve_variable_with_filters(s, context)
-        return s
-
-    def render(self, context):
-        m = self.i18n_re.match(self.cmd)
-        if m:
-            f = m.group(1)
-            s = self._resolve_var(m.group(2), context)
-            if f in ('_', 'gettext'):
-                return translation.gettext(s) % context
-            elif f == 'gettext_noop':
-                return translation.gettext_noop(s) % context
-            else:
-                raise TemplateSyntaxError("i18n only supports _, gettext, gettext_noop and ngettext as functions, not %s" % f)
-        m = self.ngettext_re.match(self.cmd)
-        if m:
-            singular = self._resolve_var(m.group(1), context)
-            plural = self._resolve_var(m.group(2), context)
-            var = resolve_variable_with_filters(m.group(3), context)
-            return translation.ngettext(singular, plural, var) % context
-        raise TemplateSyntaxError("i18n must be called as {% i18n _('some message') %} or {% i18n ngettext('singular', 'plural', var) %}")
-
-        cyclevars = [v for v in args[1].split(",") if v]    # split and kill blanks
-        name = args[3]
-        node = CycleNode(cyclevars)
-
-        if not hasattr(parser, '_namedCycleNodes'):
-            parser._namedCycleNodes = {}
-
-        parser._namedCycleNodes[name] = node
-        return node
-
-def do_comment(parser, token):
-    """
@@ -814 +757 @@
-    return WidthRatioNode(this_value_var, max_value_var, max_width)
-
-def do_get_available_languages(parser, token):
-    """
-    This will store a list of available languages
-    in the context.
-
-    Usage is as follows::
-
-        {% get_available_languages as languages %}
-        {% for language in languages %}
-        ...
-        {% endfor %}
-
-    This will just pull the LANGUAGES setting from
-    your setting file (or the default settings) and
-    put it into the named variable.
-    """
-
-    args = token.contents.split()
-    if len(args) != 3 or args[1] != 'as':
-        raise template.TemplateSyntaxError("'get_available_languages' requires 'as variable' (got %r)" % args)
-    return GetAvailableLanguagesNode(args[2])
-
-def do_i18n(parser, token):
-    """
-    translate a given string with the current
-    translation object.
-
-    For example::
-
-        {% i18n _('test') %}
-        {% i18n ngettext('singular', 'plural', counter) %}
-
-    """
-    args = token.contents.split(' ', 1)
-    if len(args) != 2:
-        raise template.TemplateSyntaxError("'i18n' requires one argument (got %r)" % args)
-
-    return I18NNode(args[1].strip())
-
-register_tag('comment', do_comment)
-register_tag('cycle', do_cycle)
@@ -869 +773 @@
-register_tag('templatetag', do_templatetag)
-register_tag('widthratio', do_widthratio)
-register_tag('i18n', do_i18n)
-register_tag('get_available_languages', do_get_available_languages)

django/branches/i18n/django/templatetags/i18n.py

@@ -19 +19 @@
-        return ''
-
-
+Node
-
-    def __init__(self, variable):
@@ -113 +113 @@
-    if len(args) != 3 or args[1] != 'as':
-        raise TemplateSyntaxError, "'get_available_languages' requires 'as variable' (got %r)" % args
-AvailableLanguages
+CurrentLanguage
-
-def do_translate(parser, token):
@@ -145 +145 @@
-    in there is something that is in the .po file.
-    """
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    return TranslateNode(value, noop)
-
@@ -190 +197 @@
-        else:
-            break
-  
+
-        if token.contents.strip() != 'plural':
-            raise TemplateSyntaxError, "'blocktrans' doesn't allow other block tags inside it" % tag
@@ -201 +208 @@
-    if token.contents.strip() != 'endblocktrans':
-        raise TemplateSyntaxError, "'blocktrans' doesn't allow other block tags (seen %r) inside it" % token.contents
-
+
-    return BlockTranslateNode(extra_context, singular, plural, countervar, counter)
-
-register_tag('get_available_languages', do_get_available_languages)
-
+r
-register_tag('trans', do_translate)
-register_tag('blocktrans', do_block_translate)

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

@@ -219 +219 @@
-
-    # simple translation of a string delimited by '
-i18n _('xxxyyyxxx')
+load i18n %}{% trans 'xxxyyyxxx'
-
-    # simple translation of a string delimited by "
-
-
-
-
+
-
-    # simple translation of a variable
-4': ('{% i18n _(anton)
-
-
-5': ('{% i18n _(anton|lower)
+3': ('{% load i18n %}{% blocktrans %}{{ anton }}{% endblocktrans
+
+ and filter
+4': ('{% load i18n %}{% blocktrans with anton|lower as berta %}{{ berta }}{% endblocktrans
-
-    # simple translation of a string with interpolation
-i18n _("xxx%(anton)sxxx")
+load i18n %}{% blocktrans %}xxx{{ anton }}xxx{% endblocktrans
-
-    # simple translation of a string to german
-7': ('{% i18n _("Page not found")
+6': ('{% load i18n %}{% trans "Page not found"
-
-    # translation of singular form
-8': ('{% i18n ngettext("singular", "plural", count) %}', {'count
+7': ('{% load i18n %}{% blocktrans count number as counter %}singular{% plural %}plural{% endblocktrans %}', {'number
-
-    # translation of plural form
-9': ('{% i18n ngettext("singular", "plural", count) %}', {'count
+8': ('{% load i18n %}{% blocktrans count number as counter %}singular{% plural %}plural{% endblocktrans %}', {'number
-
-    # simple non-translation (only marking) of a string to german
-
-
-
-
-
-
-
+
-
-    # translation of a variable with a translated filter
-3
+0
-
-    # translation of a variable with a non-translated filter
-4
+1
-
-    # usage of the get_available_languages tag
-5': ('
+2': ('{% load i18n %}
-}
-