Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Tiny formatting changes to templatetags/i18n.py

git-svn-id: http://code.djangoproject.com/svn/django/trunk@1412 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit f57e22495fb336b864c9af81bbea5e16687da086 1 parent 16da4e6
@adrianholovaty adrianholovaty authored
Showing with 7 additions and 22 deletions.
  1. +7 −22 django/templatetags/i18n.py
View
29 django/templatetags/i18n.py
@@ -1,15 +1,10 @@
-"Default tags used by the template system, available to all templates."
-
from django.core.template import Node, NodeList, Template, Context, resolve_variable, resolve_variable_with_filters, registered_filters
from django.core.template import TemplateSyntaxError, register_tag, TokenParser
from django.core.template import TOKEN_BLOCK, TOKEN_TEXT, TOKEN_VAR
from django.utils import translation
-
-import sys
-import re
+import re, sys
class GetAvailableLanguagesNode(Node):
-
def __init__(self, variable):
self.variable = variable
@@ -19,7 +14,6 @@ def render(self, context):
return ''
class GetCurrentLanguageNode(Node):
-
def __init__(self, variable):
self.variable = variable
@@ -28,7 +22,6 @@ def render(self, context):
return ''
class TranslateNode(Node):
-
def __init__(self, value, noop):
self.value = value
self.noop = noop
@@ -41,7 +34,6 @@ def render(self, context):
return translation.gettext(value)
class BlockTranslateNode(Node):
-
def __init__(self, extra_context, singular, plural=None, countervar=None, counter=None):
self.extra_context = extra_context
self.singular = singular
@@ -78,7 +70,7 @@ def do_get_available_languages(parser, token):
This will store a list of available languages
in the context.
- Usage is as follows::
+ Usage::
{% get_available_languages as languages %}
{% for language in languages %}
@@ -89,7 +81,6 @@ def do_get_available_languages(parser, token):
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 TemplateSyntaxError, "'get_available_languages' requires 'as variable' (got %r)" % args
@@ -97,10 +88,9 @@ def do_get_available_languages(parser, token):
def do_get_current_language(parser, token):
"""
- This will store the current language in
- the context.
+ This will store the current language in the context.
- Usage is as follows::
+ Usage::
{% get_current_language as language %}
@@ -108,7 +98,6 @@ def do_get_current_language(parser, token):
put it's value into the ``language`` context
variable.
"""
-
args = token.contents.split()
if len(args) != 3 or args[1] != 'as':
raise TemplateSyntaxError, "'get_available_languages' requires 'as variable' (got %r)" % args
@@ -119,7 +108,7 @@ def do_translate(parser, token):
This will mark a string for translation and will
translate the string for the current language.
- Usage is like this::
+ Usage::
{% trans "this is a test" %}
@@ -144,9 +133,7 @@ def do_translate(parser, token):
the variable ``variable``. Make sure that the string
in there is something that is in the .po file.
"""
-
class TranslateParser(TokenParser):
-
def top(self):
value = self.value()
if self.more():
@@ -157,7 +144,6 @@ def top(self):
else:
noop = False
return (value, noop)
-
(value, noop) = TranslateParser(token.contents).top()
return TranslateNode(value, noop)
@@ -165,13 +151,13 @@ def do_block_translate(parser, token):
"""
This will translate a block of text with parameters.
- Format is like this::
+ Usage::
{% blocktrans with foo|filter as bar and baz|filter as boo %}
This is {{ bar }} and {{ boo }}.
{% endblocktrans %}
- Additionally this supports pluralization::
+ Additionally, this supports pluralization::
{% blocktrans count var|length as count %}
There is {{ count }} object.
@@ -231,4 +217,3 @@ def top(self):
register_tag('get_current_language', do_get_current_language)
register_tag('trans', do_translate)
register_tag('blocktrans', do_block_translate)
-
Please sign in to comment.
Something went wrong with that request. Please try again.