From 93d3f7e288f5aefa7491e293329ea9938022a9ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 5 Mar 2012 10:31:11 +0100 Subject: [PATCH] Fix merging of translations --- trans/models.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/trans/models.py b/trans/models.py index 0028b9f19..71469ee57 100644 --- a/trans/models.py +++ b/trans/models.py @@ -355,13 +355,15 @@ class Translation(models.Model): return result 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() - store.require_index() + store1.require_index() for unit2 in store2.units: if unit2.isheader(): - if isinstance(store1, poheader): + if isinstance(store1, poheader.poheader): store1.mergeheaders(store2) continue unit1 = store1.findid(unit2.getid()) @@ -377,7 +379,7 @@ class Translation(models.Model): continue unit1.merge(unit2, overwrite=overwrite) 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.check_sync()