p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[1.8.x] Refs #24324 -- Fixed makemessages crash when Django is installed in a non-ASCII path. 

Backport of 81a94cc616 from master
This commit is contained in:
Tim Graham 2015-02-15 18:59:39 -05:00
parent b2f7daa4a6
commit 9dba901d9c
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,6 +16,7 @@ from django.core.management.utils import (
find_command, handle_extensions, popen_wrapper, find_command, handle_extensions, popen_wrapper,
) )
from django.utils import six from django.utils import six
from django.utils._os import upath
from django.utils.encoding import force_str from django.utils.encoding import force_str
from django.utils.functional import cached_property, total_ordering from django.utils.functional import cached_property, total_ordering
from django.utils.jslex import prepare_js_for_gettext from django.utils.jslex import prepare_js_for_gettext
@ -472,7 +473,7 @@ class Command(BaseCommand):
the msgs string, inserting it at the right place. msgs should be the the msgs string, inserting it at the right place. msgs should be the
contents of a newly created .po file. contents of a newly created .po file.
""" """
django_dir = os.path.normpath(os.path.join(os.path.dirname(django.__file__))) django_dir = os.path.normpath(os.path.join(os.path.dirname(upath(django.__file__))))
if self.domain == 'djangojs': if self.domain == 'djangojs':
domains = ('djangojs', 'django') domains = ('djangojs', 'django')
else: else: