Commit 2d6caf3a authored by Michal Čihař's avatar Michal Čihař

Handle overwrite separately

ttkit appends fuzzy flag in case the translation is different
parent 5657e487
...@@ -433,7 +433,9 @@ class Translation(models.Model): ...@@ -433,7 +433,9 @@ class Translation(models.Model):
if not mergefuzzy: if not mergefuzzy:
if unit2.isfuzzy(): if unit2.isfuzzy():
continue continue
unit1.merge(unit2, overwrite=overwrite, comments=False) if not overwrite and unit1.istranslated():
continue
unit1.merge(unit2, overwrite=True, comments=False)
store1.save() store1.save()
ret = self.git_commit(author) ret = self.git_commit(author)
self.check_sync() self.check_sync()
......
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