Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
24
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Fix merging of translations

Browse Source
This commit is contained in:
Michal Čihař 2012-03-05 10:31:11 +01:00
parent c847f5dbaf
commit 93d3f7e288
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
trans/models.py
View File

@ -355,13 +355,15 @@ class Translation(models.Model):
return result return result
def merge_upload(self, request, fileobj, overwrite, mergefuzzy = False): def merge_upload(self, request, fileobj, overwrite, mergefuzzy = False):
store2 = factory.getobjects(fileobj) # Needed to behave like something what translate toolkit expects
fileobj.mode = "r"
store2 = factory.getobject(fileobj)
store1 = self.get_store() store1 = self.get_store()
store.require_index() store1.require_index()
for unit2 in store2.units: for unit2 in store2.units:
if unit2.isheader(): if unit2.isheader():
if isinstance(store1, poheader): if isinstance(store1, poheader.poheader):
store1.mergeheaders(store2) store1.mergeheaders(store2)
continue continue
unit1 = store1.findid(unit2.getid()) unit1 = store1.findid(unit2.getid())
@ -377,7 +379,7 @@ class Translation(models.Model):
continue continue
unit1.merge(unit2, overwrite=overwrite) unit1.merge(unit2, overwrite=overwrite)
store1.save() store1.save()
author = '%s <%s>' % (request.user.get_full_name(), request.user.email) author = u'%s <%s>' % (request.user.get_full_name(), request.user.email)
self.git_commit(author) self.git_commit(author)
self.check_sync() self.check_sync()