Fix update() fuzzy matching for messages sharing a msgid across contexts - #1330
Open
abhijeet117 wants to merge 1 commit into
Open
Fix update() fuzzy matching for messages sharing a msgid across contexts#1330abhijeet117 wants to merge 1 commit into
abhijeet117 wants to merge 1 commit into
Conversation
fuzzy_candidates was keyed by the msgid-only fuzzy key, so two messages differing only by context overwrote each other and one translation was misattached while the other silently became obsolete. Keep all candidates per key and prefer the one whose context matches the template message.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Follow-up to #1329, found while auditing the same key-handling code; this is an independent defect in update(). The fuzzy_candidates dict is keyed by the msgid-only fuzzy match key, so two messages that share a msgid but differ by context overwrite each other. When a template then renames such a msgid, one old translation is misattached to the other context and the loser silently becomes obsolete.
Testing
Reproduced with a catalog holding ("Guide", navigation) -> NavFuehrer and ("Guide", menu) -> MenuHilfe, updated from a template renaming both to "Guids": navigation received the menu translation and NavFuehrer became obsolete. Added a regression test covering both contexts plus obsolete emptiness; it fails before the fix and passes after. Full messages suite and catalog tests pass.
Checklist