finn/dominiontabs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix for correctly sorting card names with accents (#169)

Browse Source 
* fix for correctly sorting card names with accents
This commit is contained in:
Sébastien Wautelet 2017-11-18 01:21:11 +01:00 committed by Peter
parent 41ca63020d
commit a89170fd44
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
domdiv/main.py
View File

@ -6,6 +6,7 @@ import argparse
import copy
import fnmatch
import pkg_resources
import unicodedata
import reportlab.lib.pagesizes as pagesizes
from reportlab.lib.units import cm
@ -620,17 +621,22 @@ class CardSorter(object):
return card.cardset_tag.lower() != 'base' and card.name in self.baseCards
def by_global_sort_key(self, card):
return int(card.isExpansion()), self.baseIndex(card.name), card.name
return int(card.isExpansion()), self.baseIndex(card.name), self.strip_accents(card.name)
def by_expansion_sort_key(self, card):
return card.cardset, int(card.isExpansion()), self.baseIndex(
card.name), card.name
card.name), self.strip_accents(card.name)
def by_colour_sort_key(self, card):
return card.getType().getTypeNames(), card.name
return card.getType().getTypeNames(), self.strip_accents(card.name)
def by_cost_sort_key(self, card):
return card.cardset, int(card.isExpansion()), card.get_total_cost(card), card.name
return card.cardset, int(card.isExpansion()), card.get_total_cost(card), self.strip_accents(card.name)
@staticmethod
def strip_accents(s):
return ''.join(c for c in unicodedata.normalize('NFD', s)
if unicodedata.category(c) != 'Mn')
def __call__(self, card):
return self.sort_key(card)