Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
converse.js
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
converse.js
Commits
934c5ae7
Commit
934c5ae7
authored
Nov 19, 2012
by
Michal Čihař
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Try loading merge store using format defined by subproject as well
parent
67e91f51
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
2 deletions
+5
-2
weblate/trans/models.py
weblate/trans/models.py
+5
-2
No files found.
weblate/trans/models.py
View file @
934c5ae7
...
...
@@ -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
,
store
2
,
overwrite
,
mergefuzzy
,
merge_header
)
ret
|=
s
.
merge_store
(
author
,
store
,
overwrite
,
mergefuzzy
,
merge_header
)
return
ret
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment