Skip to content

Commit 5828c13

Browse files
committed
Add '_conflicts' getter in catalog
1 parent 0a6388d commit 5828c13

2 files changed

Lines changed: 4 additions & 1 deletion

File tree

babel/messages/catalog.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -769,6 +769,9 @@ def add_conflict(self, message: Message, filename: str, project: str, version: s
769769
if fuzzy:
770770
message.flags |= {'fuzzy'}
771771

772+
def get_conflicts(self, id: _MessageID) -> list[ConflictInfo]:
773+
return self._conflicts.get(id, [])
774+
772775
def add(
773776
self,
774777
id: _MessageID,

babel/messages/pofile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -745,7 +745,7 @@ def _format_message(message, prefix=''):
745745
norm_previous_id = normalize(message.previous_id[1], width=width)
746746
yield from _format_comment(f'msgid_plural {norm_previous_id}', prefix='|')
747747

748-
if len(conflicts := catalog._conflicts.get(message.id, [])) > 0:
748+
if len(conflicts := catalog.get_conflicts(message.id)) > 0:
749749
yield from _format_conflict(message.id, conflicts)
750750
else:
751751
yield from _format_message(message)

0 commit comments

Comments
 (0)