Skip to content

Commit f1618e5

Browse files
committed
Add '_conflicts' getter in catalog
1 parent 49e6003 commit f1618e5

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

babel/messages/catalog.py

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

805+
def get_conflicts(self, id: _MessageID) -> list[ConflictInfo]:
806+
return self._conflicts.get(id, [])
807+
805808
def add(
806809
self,
807810
id: _MessageID,

babel/messages/pofile.py

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

754-
if len(conflicts := catalog._conflicts.get(message.id, [])) > 0:
754+
if len(conflicts := catalog.get_conflicts(message.id)) > 0:
755755
yield from _format_conflict(message.id, conflicts)
756756
else:
757757
yield from _format_message(message)

0 commit comments

Comments
 (0)