Merge remote-tracking branch 'origin/master'

c745034b · Michal Čihař · 807f4555 · 2d6caf3a · c745034b
Commit c745034b authored Mar 14, 2012 by Michal Čihař
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

trans/models.py trans/models.py +3 -1

No files found.
--- a/trans/models.py
+++ b/trans/models.py
@@ -433,7 +433,9 @@ class Translation(models.Model):
                if not mergefuzzy:
                    if unit2.isfuzzy():
                        continue
-                unit1.merge(unit2, overwrite=overwrite, comments=False)
+                if not overwrite and unit1.istranslated():
+                    continue
+                unit1.merge(unit2, overwrite=True, comments=False)
        store1.save()
        ret = self.git_commit(author)
        self.check_sync()