mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-01-26 10:09:42 +00:00
Code Issues 32 Releases Wiki Activity

[5.0.x] Fixed #34848 -- Ignored i18n_catalog.js file when building Django's translations catalog.

Browse Source 
Backport of d7972436639bacada0f94d3b9818446343af59ad from main
This commit is contained in:
Natalia 2023-09-20 17:39:01 -03:00 committed by Mariusz Felisiak
parent 41d82fda2a
commit 88992c5ac6
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
django/core/management/commands/makemessages.py
View File

@ -392,6 +392,7 @@ class Command(BaseCommand):
if os.path.isdir(os.path.join("conf", "locale")):
self.locale_paths = [os.path.abspath(os.path.join("conf", "locale"))]
self.default_locale_path = self.locale_paths[0]
self.ignore_patterns.append("views/templates/i18n_catalog.js")
self.invoked_for_django = True
else:
if self.settings_available:

22
tests/i18n/test_extraction.py
View File

@ -638,6 +638,28 @@ class JavaScriptExtractorTests(ExtractorTests):
_, po_contents = self._run_makemessages(domain="djangojs")
self.assertMsgId("Static content inside app should be included.", po_contents)
def test_i18n_catalog_ignored_when_invoked_for_django(self):
# Create target file so it exists in the filesystem and can be ignored.
# "invoked_for_django" is True when "conf/locale" folder exists.
os.makedirs(os.path.join("conf", "locale"))
i18n_catalog_js_dir = os.path.join(os.path.curdir, "views", "templates")
os.makedirs(i18n_catalog_js_dir)
open(os.path.join(i18n_catalog_js_dir, "i18n_catalog.js"), "w").close()
out, _ = self._run_makemessages(domain="djangojs")
self.assertIn(f"ignoring file i18n_catalog.js in {i18n_catalog_js_dir}", out)
def test_i18n_catalog_not_ignored_when_not_invoked_for_django(self):
# Create target file so it exists in the filesystem but is NOT ignored.
# "invoked_for_django" is False when "conf/locale" folder does not exist.
self.assertIs(os.path.exists(os.path.join("conf", "locale")), False)
i18n_catalog_js = os.path.join("views", "templates", "i18n_catalog.js")
os.makedirs(os.path.dirname(i18n_catalog_js))
open(i18n_catalog_js, "w").close()
out, _ = self._run_makemessages(domain="djangojs")
self.assertNotIn("ignoring file i18n_catalog.js", out)
class IgnoredExtractorTests(ExtractorTests):
def test_ignore_directory(self):