Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

…me 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
  • Loading branch information...
commit 6a3c9159338055339f64e73de39598d26e5656c8 1 parent a1ecd07
@jezdez jezdez authored
View
2  django/core/management/commands/makemessages.py
@@ -18,7 +18,7 @@
# 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',)):
"""
View
0  tests/regressiontests/makemessages/__init__.py
No changes.
View
4 tests/regressiontests/makemessages/javascript.js
@@ -0,0 +1,4 @@
+// '
+gettext('This literal should be included.')
+// '
+gettext('This one as well.')
View
0  tests/regressiontests/makemessages/locale/dummy
No changes.
View
0  tests/regressiontests/makemessages/models.py
No changes.
View
42 tests/regressiontests/makemessages/tests.py
@@ -0,0 +1,42 @@
+import os
+import re
+import shutil
+from django.test import TestCase
+from django.core import management
+
+LOCALE='de'
+
+class ExtractorTests(TestCase):
+
+ def setUp(self):
+ self._cwd = os.getcwd()
+ self.test_dir = os.path.abspath(os.path.dirname(__file__))
+
+ def _rmrf(self, dname):
+ if os.path.commonprefix([self.test_dir, os.path.abspath(dname)]) != self.test_dir:
+ return
+ shutil.rmtree(dname)
+
+ def tearDown(self):
+ os.chdir(self.test_dir)
+ try:
+ self._rmrf('locale/%s' % LOCALE)
+ except OSError:
+ pass
+ os.chdir(self._cwd)
+
+ def assertMsgId(self, msgid, s):
+ return self.assert_(re.search('^msgid "%s"' % msgid, s, re.MULTILINE))
+
+
+class JavascriptExtractorTests(ExtractorTests):
+
+ PO_FILE='locale/%s/LC_MESSAGES/djangojs.po' % LOCALE
+
+ def test_javascript_literals(self):
+ os.chdir(self.test_dir)
+ management.call_command('makemessages', domain='djangojs', locale=LOCALE, verbosity=0)
+ self.assert_(os.path.exists(self.PO_FILE))
+ po_contents = open(self.PO_FILE, 'r').read()
+ self.assertMsgId('This literal should be included.', po_contents)
+ self.assertMsgId('This one as well.', po_contents)
Please sign in to comment.
Something went wrong with that request. Please try again.