summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Holovaty <adrian@holovaty.com>2006-01-27 15:49:50 +0000
committerAdrian Holovaty <adrian@holovaty.com>2006-01-27 15:49:50 +0000
commite35655081f105c727d6d57db75ae1b99aa22b60d (patch)
tree65890f1f0729ea7bbfeb7977f01fd7b86818f6d2
parent23d2be171447bef6f0b30686ffe5324b646d3fb6 (diff)
Fixed #1244 -- Renamed templateize to templatize in django.utils.translation.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2132 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rwxr-xr-xdjango/bin/make-messages.py4
-rw-r--r--django/utils/translation.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/django/bin/make-messages.py b/django/bin/make-messages.py
index 600799858f..5c74faecbb 100755
--- a/django/bin/make-messages.py
+++ b/django/bin/make-messages.py
@@ -1,6 +1,6 @@
#!/usr/bin/python
-from django.utils.translation import templateize
+from django.utils.translation import templatize
import re
import os
import sys
@@ -96,7 +96,7 @@ def make_messages():
thefile = file
if file.endswith('.html'):
src = open(os.path.join(dirpath, file), "rb").read()
- open(os.path.join(dirpath, '%s.py' % file), "wb").write(templateize(src))
+ open(os.path.join(dirpath, '%s.py' % file), "wb").write(templatize(src))
thefile = '%s.py' % file
if verbose: sys.stdout.write('processing file %s in %s\n' % (file, dirpath))
cmd = 'xgettext %s -d %s -L Python --keyword=gettext_noop --keyword=gettext_lazy --keyword=ngettext_lazy -o - "%s"' % (
diff --git a/django/utils/translation.py b/django/utils/translation.py
index dda8c5d7b6..56cd5426f0 100644
--- a/django/utils/translation.py
+++ b/django/utils/translation.py
@@ -369,7 +369,7 @@ dot_re = re.compile(r'\S')
def blankout(src, char):
"""
Changes every non-whitespace character to the given char.
- Used in the templateize function.
+ Used in the templatize function.
"""
return dot_re.sub(char, src)
@@ -378,7 +378,7 @@ block_re = re.compile(r"""^\s*blocktrans(?:\s+|$)""")
endblock_re = re.compile(r"""^\s*endblocktrans$""")
plural_re = re.compile(r"""^\s*plural$""")
constant_re = re.compile(r"""_\(((?:".*?")|(?:'.*?'))\)""")
-def templateize(src):
+def templatize(src):
"""
Turns a Django template into something that is understood by xgettext. It
does so by translating the Django translation tags into standard gettext