Added support for merging comments on file upload.

Fixes #874
Signed-off-by: Michal Čihař <michal@cihar.com>

docs/changes.rst

@@ -9,6 +9,7 @@ Released on ? 2015.
 * Fixed automatic translation for project owners.
 * Improved performance of commit and push operations.
 * New management command to add suggestions from command line.
+* Added support for merging comments on file upload.
 
 weblate 2.4
 -----------

weblate/trans/forms.py

@@ -358,6 +358,12 @@ class SimpleUploadForm(forms.Form):
         required=False,
         initial=True,
     )
+    merge_comments = forms.BooleanField(
+        label=_('Merge translation comments'),
+        help_text=_('Merges comments into the translation.'),
+        required=False,
+        initial=True,
+    )
 
 
 class UploadForm(SimpleUploadForm):

weblate/trans/models/translation.py

@@ -1083,7 +1083,7 @@ class Translation(models.Model, URLMixin, PercentMixin, LoggerMixin):
         return ret
 
     def merge_store(self, request, author, store2, overwrite, merge_header,
-                    add_fuzzy, fuzzy):
+                    add_fuzzy, fuzzy, merge_comments=False):
         '''
         Merges translate-toolkit store into current translation.
         '''
@@ -1116,7 +1116,7 @@ class Translation(models.Model, URLMixin, PercentMixin, LoggerMixin):
                     continue
 
                 # Actually update translation
-                unit1.merge(unit2.unit, overwrite=True, comments=False)
+                unit1.merge(unit2.unit, overwrite=True, comments=merge_comments)
 
                 # Handle
                 if add_fuzzy or set_fuzzy:

weblate/trans/views/files.py

@@ -117,6 +117,7 @@ def upload_translation(request, project, subproject, lang):
             overwrite,
             author,
             merge_header=form.cleaned_data['merge_header'],
+            merge_comments=form.cleaned_data['merge_comments'],
             method=form.cleaned_data['method'],
             fuzzy=form.cleaned_data['fuzzy'],
         )