diff --git a/pysollib/app.py b/pysollib/app.py index c506a376..8810abc4 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -1190,7 +1190,7 @@ Please select a %s type %s. if gi is None: return None if gi.rules_filename is not None: return gi.rules_filename - n = gi.name + n = gi.en_name # english name ##n = re.sub(r"[\[\(].*$", "", n) n = latin1_to_ascii(n) n = re.sub(r"[^\w]", "", n) @@ -1205,7 +1205,7 @@ Please select a %s type %s. if os.path.supports_unicode_filenames: # new in python 2.3 return self.getGameTitleName(id) gi = self.gdb.get(id) - n = gi.name + n = gi.en_name # english name if not n: return None ## m = re.search(r"^(.*)([\[\(](\w+).*[\]\)])\s*$", n) ## if m: diff --git a/pysollib/gamedb.py b/pysollib/gamedb.py index 5c7343e6..1a7f5f0d 100644 --- a/pysollib/gamedb.py +++ b/pysollib/gamedb.py @@ -418,6 +418,7 @@ class GameInfo(Struct): ncards = decks * (len(suits) * len(ranks) + len(trumps)) game_flags = game_type & ~1023 game_type = game_type & 1023 + en_name = name # for Application.getGameRulesFilename name = gettext_name(name) if not short_name: short_name = name @@ -473,7 +474,7 @@ class GameInfo(Struct): # Struct.__init__(self, id=id, gameclass=gameclass, name=name, short_name=short_name, - altnames=tuple(altnames), + altnames=tuple(altnames), en_name=en_name, decks=decks, redeals=redeals, ncards=ncards, category=category, skill_level=skill_level, suits=tuple(suits), ranks=tuple(ranks), diff --git a/pysollib/games/threepeaks.py b/pysollib/games/threepeaks.py index e56fe0fd..2d0d9a65 100644 --- a/pysollib/games/threepeaks.py +++ b/pysollib/games/threepeaks.py @@ -283,7 +283,7 @@ class ThreePeaksNoScore(ThreePeaks): registerGame(GameInfo(22216, ThreePeaks, "Three Peaks", - GI.GT_PAIRING_TYPE, 1, 0, GI.SL_BALANCED, + GI.GT_PAIRING_TYPE | GI.GT_SCORE, 1, 0, GI.SL_BALANCED, altnames=("Tri Peaks",) )) registerGame(GameInfo(22231, ThreePeaksNoScore, "Three Peaks Non-scoring", diff --git a/pysollib/tk/selectgame.py b/pysollib/tk/selectgame.py index a698a710..625e42c5 100644 --- a/pysollib/tk/selectgame.py +++ b/pysollib/tk/selectgame.py @@ -548,6 +548,7 @@ class SelectGameDialogWithPreview(SelectGameDialog): def updateInfo(self, gameid): gi = self.app.gdb.get(gameid) # info + name = gi.name altnames = '\n'.join(gi.altnames) category = _(CSI.TYPE[gi.category]) type = ''