David Jean Louis avatar David Jean Louis committed 4f7fd5d Merge

Merged Tim Gerundt fixes (thanks !)

Comments (0)

Files changed (3)

             and occurrences will be discarded
           - any translations or comments in the file will be discarded,
             however dot comments and file positions will be preserved
+          - keep the fuzzy flag
 
         **Keyword argument**:
           - *refpot*: object POFile, the reference catalog.
         self.msgctxt = other.msgctxt
         self.occurrences = other.occurrences
         self.comment = other.comment
-        self.flags = other.flags
+        fuzzy = 'fuzzy' in self.flags
+        self.flags = other.flags[:] #Clone flags
+        if fuzzy:
+            self.flags.append('fuzzy')
         self.msgid_plural = other.msgid_plural
         self.obsolete = other.obsolete
         self.previous_msgctxt = other.previous_msgctxt

tests/test_merge_after.po

 msgstr "Some translation ..."
 
 #: utils/timesince.py:12
+#, fuzzy
 msgid "year"
 msgid_plural "years"
 msgstr[0] "année"

tests/test_merge_before.po

 msgstr "Some translation"
 
 #: utils/timesince.py:12
+#, fuzzy
 msgid "year"
 msgid_plural "years"
 msgstr[0] "année"
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.