Changeset 1066

Timestamp:

11/03/05 11:10:16 (3 years ago)

Author:

hugo

Message:

i18n: fixed documentation and message scanner for constant string translations

Files:

• django/branches/i18n/django/utils/translation.py (modified) (3 diffs)
• django/branches/i18n/docs/translation.txt (modified) (1 diff)

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

@@ -365 +365 @@
-endblock_re = re.compile(r"""^\s*endblocktrans$""")
-plural_re = re.compile(r"""^\s*plural$""")
+constant_re = re.compile(r"""_\(((?:".*?")|(?:'.*?'))\)""")
-def templateize(src):
-    from django.core.template import tokenize, TOKEN_TEXT, TOKEN_VAR, TOKEN_BLOCK
@@ -415 +416 @@
-                imatch = inline_re.match(t.contents)
-                bmatch = block_re.match(t.contents)
+                cmatches = constant_re.findall(t.contents)
-                if imatch:
-                    g = imatch.group(1)
@@ -425 +427 @@
-                    singular = []
-                    plural = []
+                elif cmatches:
+                    for cmatch in cmatches:
+                        out.write(' _(%s) ' % cmatch)
-                else:
-                    out.write(blankout(t.contents, 'B'))
-            elif t.token_type == TOKEN_VAR:
-                parts = t.contents.split('|')
-
+
+
+
+
-                    if p.find(':_(') >= 0:
-                        out.write(' %s ' % p.split(':',1)[1])

django/branches/i18n/docs/translation.txt

@@ -172 +172 @@
-All tags live in the ``i18n`` tag library, so you need to specify
-``{% load i18n %}`` in the head of your template to make use of them.
+
+There are some places where you will encounter constant strings in your template code.
+One is filter arguments, the other are normal string constants for tags. If you need to
+translate those, you can use the ``_("....")`` syntax::
+
+    {% some_special_tag _("Page not found") value|yesno:_("yes,no") %}
+
+In this case both the filter and the tag will see the already translated string, so they
+don't need to be aware of translations. And both strings will be pulled out of the templates
+for translation and stored in the .po files.
-
-The ``setlang`` redirect view