Django/django
11
0
Fork 0
Code Pull Requests Projects Releases Activity

Fixed #24805 -- Delayed check for locale_dir in makemessages

Browse Source 
Thanks Wim Feijen for the report.
This commit is contained in:
Claude Paroz 2015-05-15 10:23:11 +02:00
parent dc8edc9dbf
commit 7b027c463e
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,6 +23,7 @@ from django.utils.text import get_text_list
plural_forms_re = re.compile(r'^(?P<value>"Plural-Forms.+?\\n")\s*$', re.MULTILINE | re.DOTALL) plural_forms_re = re.compile(r'^(?P<value>"Plural-Forms.+?\\n")\s*$', re.MULTILINE | re.DOTALL)
STATUS_OK = 0 STATUS_OK = 0
NO_LOCALE_DIR = object()
def check_programs(*programs): def check_programs(*programs):
@ -150,6 +151,10 @@ class TranslatableFile(object):
command.stdout.write(errors) command.stdout.write(errors)
if msgs: if msgs:
# Write/append messages to pot file # Write/append messages to pot file
if self.locale_dir is NO_LOCALE_DIR:
file_path = os.path.normpath(os.path.join(self.dirpath, self.file))
raise CommandError(
"Unable to find a locale path to store translations for file %s" % file_path)
potfile = os.path.join(self.locale_dir, '%s.pot' % str(domain)) potfile = os.path.join(self.locale_dir, '%s.pot' % str(domain))
if is_templatized: if is_templatized:
# Remove '.py' suffix # Remove '.py' suffix
@ -436,8 +441,7 @@ class Command(BaseCommand):
if not locale_dir: if not locale_dir:
locale_dir = self.default_locale_path locale_dir = self.default_locale_path
if not locale_dir: if not locale_dir:
raise CommandError( locale_dir = NO_LOCALE_DIR
"Unable to find a locale path to store translations for file %s" % file_path)
all_files.append(TranslatableFile(dirpath, filename, locale_dir)) all_files.append(TranslatableFile(dirpath, filename, locale_dir))
return sorted(all_files) return sorted(all_files)