mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-22 09:05:43 +00:00
Code Issues 25 Releases Wiki Activity

Fixed #29712 -- Made makemessages warn if locales have hyphens and skip them.

Browse Source
This commit is contained in:
manav014 2020-10-27 17:22:30 +05:30 committed by Mariusz Felisiak
parent 8ed024b9b9
commit f63f3cdf09
4 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -564,6 +564,7 @@ answer newbie questions, and generally made Django that much better:
Mads Jensen <https://github.com/atombrella>
Makoto Tsuyuki <mtsuyuki@gmail.com>
Malcolm Tredinnick
Manav Agarwal <dpsman13016@gmail.com>
Manuel Saelices <msaelices@yaco.es>
Manuzhai
Marc Aymerich Gubern

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

@ -383,6 +383,14 @@ class Command(BaseCommand):
# Build po files for each selected locale
for locale in locales:
if '-' in locale:
self.stdout.write(
'invalid locale %s, did you mean %s?' % (
locale,
locale.replace('-', '_'),
),
)
continue
if self.verbosity > 0:
self.stdout.write('processing locale %s' % locale)
for potfile in potfiles:

4
docs/releases/3.2.txt
View File

@ -600,6 +600,10 @@ Miscellaneous
* The password reset mechanism now invalidates tokens when the user email is
changed.
* :djadmin:`makemessages` command no longer processes invalid locales specified
using :option:`makemessages --locale` option, when they contain hyphens
(``'-'``).
.. _deprecated-features-3.2:
Features deprecated in 3.2

14
tests/i18n/test_extraction.py
View File

@ -152,6 +152,20 @@ class BasicExtractorTests(ExtractorTests):
with self.assertRaisesRegex(CommandError, msg):
management.call_command('makemessages')
def test_valid_locale(self):
out = StringIO()
management.call_command('makemessages', locale=['de'], stdout=out, verbosity=1)
self.assertNotIn('invalid locale de', out.getvalue())
self.assertIn('processing locale de', out.getvalue())
self.assertIs(Path(self.PO_FILE).exists(), True)
def test_invalid_locale(self):
out = StringIO()
management.call_command('makemessages', locale=['pl-PL'], stdout=out, verbosity=1)
self.assertIn('invalid locale pl-PL, did you mean pl_PL?', out.getvalue())
self.assertNotIn('processing locale pl-PL', out.getvalue())
self.assertIs(Path('locale/pl-PL/LC_MESSAGES/django.po').exists(), False)
def test_comments_extractor(self):
management.call_command('makemessages', locale=[LOCALE], verbosity=0)
self.assertTrue(os.path.exists(self.PO_FILE))