jbdod/notes-ker-lann
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Preserve dashes in Alias normalisation

Browse source
This commit is contained in:
Yohann D'ANELLO 2020-08-30 17:28:36 +02:00
parent b454ad8dad
commit ca7f4791ed
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
apps/note/models/notes.py
View file

@ -247,10 +247,10 @@ class Alias(models.Model):
Normalizes a string: removes most diacritics, does casefolding and ignore non-ASCII characters Normalizes a string: removes most diacritics, does casefolding and ignore non-ASCII characters
""" """
return ''.join( return ''.join(
char for char in unicodedata.normalize('NFKD', string.casefold().replace('æ', 'ae') char for char in unicodedata.normalize('NFKD', string.casefold().replace('æ', 'ae').replace('œ', 'oe'))
.replace('œ', 'oe').replace('-', '_'))
if all(not unicodedata.category(char).startswith(cat) if all(not unicodedata.category(char).startswith(cat)
for cat in {'M', 'P', 'Z', 'C'})).casefold().encode('ascii', 'ignore').decode('ascii') for cat in {'M', 'Pc', 'Pe', 'Pf', 'Pi', 'Po', 'Ps', 'Z', 'C'}))\
.casefold().encode('ascii', 'ignore').decode('ascii')
def clean(self): def clean(self):
normalized_name = self.normalize(self.name) normalized_name = self.normalize(self.name)