Skip to content

Commit

Permalink
Added category to the tree for games with jokers.
Browse files Browse the repository at this point in the history
  • Loading branch information
joeraz committed Mar 21, 2024
1 parent 526abc0 commit d9d02d4
Show file tree
Hide file tree
Showing 10 changed files with 52 additions and 22 deletions.
11 changes: 7 additions & 4 deletions po/de_pysol.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ msgstr ""
"Project-Id-Version: PySol 0.0.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-12-10 10:19-0500\n"
"PO-Revision-Date: 2024-03-15 23:06-0400\n"
"PO-Revision-Date: 2024-03-21 18:22-0400\n"
"Last-Translator: H. Schaekel <[email protected]>\n"
"Language-Team: German\n"
"Language: de\n"
Expand Down Expand Up @@ -1266,9 +1266,6 @@ msgstr[1] "%d Wiederholungen"
msgid "Talon."
msgstr "Talon."

msgid "Reserve."
msgstr "Reserve."

#: pysollib/stack.py:2228 pysollib/stack.py:2992
msgid "Reserve. No building."
msgstr "Reserve. Nicht aufgebaut."
Expand Down Expand Up @@ -2376,6 +2373,9 @@ msgstr ""
"Tableau. Aufgebaut nach Farbe. Sequenzen von Karten in der gleichen Farbe "
"können als eine Einheit bewegt werden."

msgid "Reserve."
msgstr "Reserve."

#: pysollib/games/klondike.py:461
msgid "Reserve. Only Kings are acceptable."
msgstr "Reserve. Nur Könige sind erlaubt."
Expand Down Expand Up @@ -3264,6 +3264,9 @@ msgstr ""
msgid "Games with Separate Decks"
msgstr "Spiele mit separaten Decks"

msgid "Games with Jokers"
msgstr ""

#: pysollib/kivy/selectgame.py:271 pysollib/pysolgtk/selectgame.py:306
#: pysollib/tile/selectgame.py:249 pysollib/tk/selectgame.py:249
msgid "Open Games (all cards visible)"
Expand Down
11 changes: 7 additions & 4 deletions po/fr_pysol.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: 1.02\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-12-10 10:19-0500\n"
"PO-Revision-Date: 2024-03-15 23:06-0400\n"
"PO-Revision-Date: 2024-03-21 18:23-0400\n"
"Last-Translator: Eric Rausch <[email protected]>\n"
"Language-Team: French\n"
"Language: fr\n"
Expand Down Expand Up @@ -1296,9 +1296,6 @@ msgstr[1] "%d donnes"
msgid "Talon."
msgstr "Talon."

msgid "Reserve."
msgstr "Réserve."

#: pysollib/stack.py:2228 pysollib/stack.py:2992
msgid "Reserve. No building."
msgstr "Réserve. Aucun empilement."
Expand Down Expand Up @@ -2415,6 +2412,9 @@ msgstr ""
"Tableau. Décroissant par couleur. Les ensembles de cartes d'une même "
"enseigne peuvent être déplacés entièrement."

msgid "Reserve."
msgstr "Réserve."

#: pysollib/games/klondike.py:461
msgid "Reserve. Only Kings are acceptable."
msgstr "Réserve. Rois seuls."
Expand Down Expand Up @@ -3303,6 +3303,9 @@ msgstr ""
msgid "Games with Separate Decks"
msgstr "Jeux avec jeux de cartes séparés"

msgid "Games with Jokers"
msgstr ""

#: pysollib/kivy/selectgame.py:271 pysollib/pysolgtk/selectgame.py:306
#: pysollib/tile/selectgame.py:249 pysollib/tk/selectgame.py:249
msgid "Open Games (all cards visible)"
Expand Down
5 changes: 4 additions & 1 deletion po/it_pysol.po
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ msgstr ""
"Project-Id-Version: it_pysol\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-12-10 10:19-0500\n"
"PO-Revision-Date: 2024-03-15 23:06-0400\n"
"PO-Revision-Date: 2024-03-21 18:23-0400\n"
"Last-Translator: Giuliano Colla <[email protected]>\n"
"Language-Team: Italiano <[email protected]>\n"
"Language: it\n"
Expand Down Expand Up @@ -3368,6 +3368,9 @@ msgstr ""
msgid "Games with Separate Decks"
msgstr "Giochi con mazzi separati"

msgid "Games with Jokers"
msgstr ""

#: pysollib/kivy/selectgame.py:271 pysollib/pysolgtk/selectgame.py:306
#: pysollib/tile/selectgame.py:249 pysollib/tk/selectgame.py:249
msgid "Open Games (all cards visible)"
Expand Down
11 changes: 7 additions & 4 deletions po/pl_pysol.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: PySolFC\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-12-10 10:19-0500\n"
"PO-Revision-Date: 2024-03-15 23:05-0400\n"
"PO-Revision-Date: 2024-03-21 18:24-0400\n"
"Last-Translator: Jerzy Trzeciak <[email protected]>\n"
"Language-Team: Polish <[email protected]>\n"
"Language: pl\n"
Expand Down Expand Up @@ -1303,9 +1303,6 @@ msgstr[2] "%d rozdań"
msgid "Talon."
msgstr "Stos wyjściowy."

msgid "Reserve."
msgstr "Stos rezerwowy."

#: pysollib/stack.py:2228 pysollib/stack.py:2992
msgid "Reserve. No building."
msgstr "Stos rezerwowy. Nie układaj."
Expand Down Expand Up @@ -2429,6 +2426,9 @@ msgstr ""
"Stół gry. Układaj w dół według barwy. Sekwens kart tego samego koloru można "
"przenieść jako całość."

msgid "Reserve."
msgstr "Stos rezerwowy."

#: pysollib/games/klondike.py:461
msgid "Reserve. Only Kings are acceptable."
msgstr "Stos rezerwowy. Tylko Króle są dozwolone."
Expand Down Expand Up @@ -3318,6 +3318,9 @@ msgstr ""
msgid "Games with Separate Decks"
msgstr "Gry z odrębnymi taliami"

msgid "Games with Jokers"
msgstr ""

#: pysollib/kivy/selectgame.py:271 pysollib/pysolgtk/selectgame.py:306
#: pysollib/tile/selectgame.py:249 pysollib/tk/selectgame.py:249
msgid "Open Games (all cards visible)"
Expand Down
11 changes: 7 additions & 4 deletions po/pt_BR_pysol.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-12-10 10:19-0500\n"
"PO-Revision-Date: 2024-03-15 23:05-0400\n"
"PO-Revision-Date: 2024-03-21 18:24-0400\n"
"Last-Translator: Matheus Knack <[email protected]>\n"
"Language-Team: \n"
"Language: pt_BR\n"
Expand Down Expand Up @@ -1295,9 +1295,6 @@ msgstr[1] "%d redistribuições"
msgid "Talon."
msgstr "Monte"

msgid "Reserve."
msgstr "Reservar."

#: pysollib/stack.py:2228 pysollib/stack.py:2992
msgid "Reserve. No building."
msgstr "Reservar. Sem construção."
Expand Down Expand Up @@ -2437,6 +2434,9 @@ msgstr ""
"Tableau. Descrescente por cor. Sequências de cartas de mesmo naipe podem ser "
"movidas como uma unidade."

msgid "Reserve."
msgstr "Reservar."

#: pysollib/games/klondike.py:461
msgid "Reserve. Only Kings are acceptable."
msgstr "Reserva. Somente Reis são aceitos."
Expand Down Expand Up @@ -3324,6 +3324,9 @@ msgstr "Jogos com Baralhos Despojados"
msgid "Games with Separate Decks"
msgstr "Jogos com Baralhos Separados"

msgid "Games with Jokers"
msgstr ""

#: pysollib/kivy/selectgame.py:271 pysollib/pysolgtk/selectgame.py:306
#: pysollib/tile/selectgame.py:249 pysollib/tk/selectgame.py:249
msgid "Open Games (all cards visible)"
Expand Down
3 changes: 3 additions & 0 deletions po/pysol.pot
Original file line number Diff line number Diff line change
Expand Up @@ -3132,6 +3132,9 @@ msgstr ""
msgid "Games with Separate Decks"
msgstr ""

msgid "Games with Jokers"
msgstr ""

#: pysollib/kivy/selectgame.py:271 pysollib/pysolgtk/selectgame.py:306
#: pysollib/tile/selectgame.py:249 pysollib/tk/selectgame.py:249
msgid "Open Games (all cards visible)"
Expand Down
11 changes: 7 additions & 4 deletions po/ru_pysol.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-12-10 10:19-0500\n"
"PO-Revision-Date: 2024-03-15 23:05-0400\n"
"PO-Revision-Date: 2024-03-21 18:26-0400\n"
"Last-Translator: Skomoroh <[email protected]>\n"
"Language-Team: Russian <[email protected]>\n"
"Language: ru\n"
Expand Down Expand Up @@ -1293,9 +1293,6 @@ msgstr[2] "%d пересдач"
msgid "Talon."
msgstr "Колода."

msgid "Reserve."
msgstr "Резерв."

#: pysollib/stack.py:2228 pysollib/stack.py:2992
msgid "Reserve. No building."
msgstr "Резерв. Без выкладывания."
Expand Down Expand Up @@ -2422,6 +2419,9 @@ msgstr ""
"Игровой стол. Складывать по убыванию в соответствии с цветом. Можно "
"перемещать серии карт одинаковой масти."

msgid "Reserve."
msgstr "Резерв."

#: pysollib/games/klondike.py:461
msgid "Reserve. Only Kings are acceptable."
msgstr "Резерв. Только для королей."
Expand Down Expand Up @@ -3377,6 +3377,9 @@ msgstr ""
msgid "Games with Separate Decks"
msgstr "Игры с раздельными колодами"

msgid "Games with Jokers"
msgstr ""

#: pysollib/kivy/selectgame.py:271 pysollib/pysolgtk/selectgame.py:306
#: pysollib/tile/selectgame.py:249 pysollib/tk/selectgame.py:249
msgid "Open Games (all cards visible)"
Expand Down
5 changes: 4 additions & 1 deletion pysollib/kivy/selectgame.py
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ def select_func(gi, games=games):
lambda gi: gi.si.redeals == 3),
SelectGameNode(None, _("Unlimited redeals"),
lambda gi: gi.si.redeals == -1),
SelectGameNode(None, "Variable redeals",
SelectGameNode(None, _("Variable redeals"),
lambda gi: gi.si.redeals == -2),
SelectGameNode(None, _("Other number of redeals"),
lambda gi: gi.si.redeals not in
Expand All @@ -274,6 +274,9 @@ def select_func(gi, games=games):
lambda gi: gi.si.game_flags & GI.GT_STRIPPED),
SelectGameNode(None, _("Games with Separate Decks"),
lambda gi: gi.si.game_flags & GI.GT_SEPARATE_DECKS),
SelectGameNode(None, _("Games with Jokers"),
lambda gi: gi.category == GI.GC_FRENCH and
gi.subcategory == GI.GS_JOKER_DECK),
SelectGameNode(None, _("Open Games (all cards visible)"),
lambda gi: gi.si.game_flags & GI.GT_OPEN),
SelectGameNode(None, _("Relaxed Variants"),
Expand Down
3 changes: 3 additions & 0 deletions pysollib/tile/selectgame.py
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,9 @@ def select_func(gi, games=games):
SelectGameNode(None, _("Games with Separate Decks"),
lambda gi: gi.si.game_flags &
GI.GT_SEPARATE_DECKS),
SelectGameNode(None, _("Games with Jokers"),
lambda gi: gi.category == GI.GC_FRENCH and
gi.subcategory == GI.GS_JOKER_DECK),
SelectGameNode(None, _("Open Games (all cards visible)"),
lambda gi: gi.si.game_flags & GI.GT_OPEN),
SelectGameNode(None, _("Relaxed Variants"),
Expand Down
3 changes: 3 additions & 0 deletions pysollib/tk/selectgame.py
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,9 @@ def select_func(gi, games=games):
SelectGameNode(
None, _("Games with Separate Decks"),
lambda gi: gi.si.game_flags & GI.GT_SEPARATE_DECKS),
SelectGameNode(None, _("Games with Jokers"),
lambda gi: gi.category == GI.GC_FRENCH and
gi.subcategory == GI.GS_JOKER_DECK),
SelectGameNode(None, _("Open Games (all cards visible)"),
lambda gi: gi.si.game_flags & GI.GT_OPEN),
SelectGameNode(None, _("Relaxed Variants"),
Expand Down

0 comments on commit d9d02d4

Please sign in to comment.