From 6a3c9159338055339f64e73de39598d26e5656c8 Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Tue, 16 Feb 2010 12:51:43 +0000 Subject: [PATCH] [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 --- .../core/management/commands/makemessages.py | 2 +- .../regressiontests/makemessages/__init__.py | 0 .../makemessages/javascript.js | 4 ++ .../regressiontests/makemessages/locale/dummy | 0 tests/regressiontests/makemessages/models.py | 0 tests/regressiontests/makemessages/tests.py | 42 +++++++++++++++++++ 6 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 tests/regressiontests/makemessages/__init__.py create mode 100644 tests/regressiontests/makemessages/javascript.js create mode 100644 tests/regressiontests/makemessages/locale/dummy create mode 100644 tests/regressiontests/makemessages/models.py create mode 100644 tests/regressiontests/makemessages/tests.py diff --git a/django/core/management/commands/makemessages.py b/django/core/management/commands/makemessages.py index e87e0f271a..bc3222cfe7 100644 --- a/django/core/management/commands/makemessages.py +++ b/django/core/management/commands/makemessages.py @@ -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',)): """ diff --git a/tests/regressiontests/makemessages/__init__.py b/tests/regressiontests/makemessages/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/regressiontests/makemessages/javascript.js b/tests/regressiontests/makemessages/javascript.js new file mode 100644 index 0000000000..bc5ec87957 --- /dev/null +++ b/tests/regressiontests/makemessages/javascript.js @@ -0,0 +1,4 @@ +// ' +gettext('This literal should be included.') +// ' +gettext('This one as well.') diff --git a/tests/regressiontests/makemessages/locale/dummy b/tests/regressiontests/makemessages/locale/dummy new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/regressiontests/makemessages/models.py b/tests/regressiontests/makemessages/models.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/regressiontests/makemessages/tests.py b/tests/regressiontests/makemessages/tests.py new file mode 100644 index 0000000000..954daf6a41 --- /dev/null +++ b/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)