Ticket #4695: 4695-javascript-makemessages-fix.diff

django/core/management/commands/makemessages.py

@@ -9 +9 @@
 
 from django.core.management.base import CommandError, BaseCommand
 
-pythonize_re = re.compile(r'\n\s*//')
+pythonize_re = re.compile(r'(?:^|\n)\s*//')
 
 def handle_extensions(extensions=('html',)):
     """

new file tests/regressiontests/makemessages/__init__.py

@@ +1 @@
+#

new file tests/regressiontests/makemessages/javascript.js

@@ +1 @@
+// '
+gettext('This literal should be included.')
+// '
+gettext('This one as well.')

new file tests/regressiontests/makemessages/locale/dummy

@@ +1 @@
+This file is her so version control systems don't delete/ignore the directory containing it.

new file tests/regressiontests/makemessages/models.py

@@ +1 @@
+#

new file tests/regressiontests/makemessages/tests.py

@@ +1 @@
+import os
+import re
+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
+        for root, dirs, files in os.walk(dname, topdown=False):
+            for name in files:
+                os.remove(os.path.join(root, name))
+            for name in dirs:
+                os.rmdir(os.path.join(root, name))
+
+    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)