diff options
| author | Aarni Koskela <akx@iki.fi> | 2023-03-02 15:50:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-02 15:50:56 +0200 |
| commit | 94e533f5d0000b6a956ba11936f4c94ebef2f97c (patch) | |
| tree | 8ab31ee362d10d9e6172bebfc14a0272ea043ed6 | |
| parent | 0ce196fccc024b1a65453ba6519954ada1dab6cb (diff) | |
| download | babel-94e533f5d0000b6a956ba11936f4c94ebef2f97c.tar.gz | |
babel.messages.catalog: deduplicate _to_fuzzy_match_key logic (#980)
| -rw-r--r-- | babel/messages/catalog.py | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/babel/messages/catalog.py b/babel/messages/catalog.py index 20a3166..fe9f45b 100644 --- a/babel/messages/catalog.py +++ b/babel/messages/catalog.py @@ -827,15 +827,13 @@ class Catalog: self._messages = OrderedDict() # Prepare for fuzzy matching - fuzzy_candidates = [] + fuzzy_candidates = {} if not no_fuzzy_matching: - fuzzy_candidates = {} for msgid in messages: if msgid and messages[msgid].string: key = self._key_for(msgid) ctxt = messages[msgid].context - modified_key = key.lower().strip() - fuzzy_candidates[modified_key] = (key, ctxt) + fuzzy_candidates[self._to_fuzzy_match_key(key)] = (key, ctxt) fuzzy_matches = set() def _merge(message: Message, oldkey: tuple[str, str] | str, newkey: tuple[str, str] | str) -> None: @@ -883,12 +881,11 @@ class Catalog: else: if not no_fuzzy_matching: # do some fuzzy matching with difflib - if isinstance(key, tuple): - matchkey = key[0] # just the msgid, no context - else: - matchkey = key - matches = get_close_matches(matchkey.lower().strip(), - fuzzy_candidates.keys(), 1) + matches = get_close_matches( + self._to_fuzzy_match_key(key), + fuzzy_candidates.keys(), + 1, + ) if matches: modified_key = matches[0] newkey, newctxt = fuzzy_candidates[modified_key] @@ -912,6 +909,14 @@ class Catalog: # used to update the catalog self.creation_date = template.creation_date + def _to_fuzzy_match_key(self, key: tuple[str, str] | str) -> str: + """Converts a message key to a string suitable for fuzzy matching.""" + if isinstance(key, tuple): + matchkey = key[0] # just the msgid, no context + else: + matchkey = key + return matchkey.lower().strip() + def _key_for(self, id: _MessageID, context: str | None = None) -> tuple[str, str] | str: """The key for a message is just the singular ID even for pluralizable messages, but is a ``(msgid, msgctxt)`` tuple for context-specific |