Commit 6a3c9159 authored by Jannis Leidel's avatar Jannis Leidel
Browse files

[1.1.X] Fixed #4695 - Worked around a problem of xgettext ignoring some... 

[1.1.X] Fixed #4695 - Worked around a problem of xgettext ignoring some translation strings in JavaScript files. Thanks, Ramiro Morales.

Backport of r12441.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12451 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent a1ecd073

django/core/management/commands/makemessages.py

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ except NameError: 
# still sensible for us to use it, since subprocess didn't exist in 2.3.

warnings.filterwarnings('ignore', category=DeprecationWarning, message=r'os\.popen3')



pythonize_re = re.compile(r'\n\s*//')

pythonize_re = re.compile(r'(?:^|\n)\s*//')



def handle_extensions(extensions=('html',)):

    """

tests/regressiontests/makemessages/__init__.py

0 → 100644
+0 −0

Empty file added.

tests/regressiontests/makemessages/javascript.js

0 → 100644
+4 −0
Original line number Diff line number Diff line 
// '

gettext('This literal should be included.')

// '

gettext('This one as well.')

tests/regressiontests/makemessages/locale/dummy

0 → 100644
+0 −0

Empty file added.

tests/regressiontests/makemessages/models.py

0 → 100644
+0 −0

Empty file added.