Commit 934c5ae7 authored by Michal Čihař's avatar Michal Čihař

Try loading merge store using format defined by subproject as well

parent 67e91f51
......@@ -1970,7 +1970,10 @@ class Translation(models.Model):
Top level handler for file uploads.
'''
# Load backend file
store2 = ttkit(fileobj)
try:
store = ttkit(fileobj)
except:
store = ttkit(fileobj, self.subproject.file_format)
# Optionally set authorship
if author is None:
......@@ -1985,7 +1988,7 @@ class Translation(models.Model):
# Do actual merge
for s in translations:
ret |= s.merge_store(author, store2, overwrite, mergefuzzy, merge_header)
ret |= s.merge_store(author, store, overwrite, mergefuzzy, merge_header)
return ret
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment