innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

[2.0.x] Fixed #28773 -- Forced pot files to use UNIX-style newlines 

Thanks Hendy Irawan for the analysis and report.
Backport of 4f5526e346 from master.
This commit is contained in:
Claude Paroz 2017-11-24 14:47:19 +01:00
parent 75c1fd6538
commit aba31aa86b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -188,7 +188,9 @@ def write_pot_file(potfile, msgs):
header_read = True header_read = True
lines.append(line) lines.append(line)
msgs = '\n'.join(lines) msgs = '\n'.join(lines)
with open(potfile, 'a', encoding='utf-8') as fp: # Force newlines of POT files to '\n' to work around
# https://savannah.gnu.org/bugs/index.php?52395
with open(potfile, 'a', encoding='utf-8', newline='\n') as fp:
fp.write(msgs) fp.write(msgs)