From f947fe084f2248a764eb1d6e03c77a8e1f66fc2d Mon Sep 17 00:00:00 2001 From: Joe R Date: Fri, 8 Sep 2023 22:55:14 -0400 Subject: [PATCH] Made sure numbers in game names are correctly hyphenated. --- html-src/rules/fortynine.html | 2 +- html-src/rules/sixbysix.html | 2 +- html-src/rules/takingsilk.html | 2 +- html-src/rules/thirtysix.html | 2 +- html-src/rules/thirtytwocards.html | 2 +- po/de_games.po | 8 ++++---- po/fr_games.po | 8 ++++---- po/games.pot | 8 ++++---- po/it_games.po | 8 ++++---- po/pl_games.po | 8 ++++---- po/pt_BR_games.po | 8 ++++---- po/ru_games.po | 8 ++++---- pysollib/games/fortythieves.py | 6 +++--- pysollib/games/golf.py | 4 ++-- pysollib/games/klondike.py | 4 ++-- 15 files changed, 40 insertions(+), 40 deletions(-) diff --git a/html-src/rules/fortynine.html b/html-src/rules/fortynine.html index e012c03a..91aada79 100644 --- a/html-src/rules/fortynine.html +++ b/html-src/rules/fortynine.html @@ -1,4 +1,4 @@ -

Forty Nine

+

Forty-Nine

Forty Thieves type. 2 decks. No redeal. diff --git a/html-src/rules/sixbysix.html b/html-src/rules/sixbysix.html index 8e40de8c..034e91e5 100644 --- a/html-src/rules/sixbysix.html +++ b/html-src/rules/sixbysix.html @@ -8,7 +8,7 @@ Move all cards to the foundations.

Quick Description

-Like Thirty Six, +Like Thirty-Six, but cards from the talon are dealt straight to the first tableau pile, and only same suit sequences can be moved between tableau piles. diff --git a/html-src/rules/takingsilk.html b/html-src/rules/takingsilk.html index e57d8a0e..90405090 100644 --- a/html-src/rules/takingsilk.html +++ b/html-src/rules/takingsilk.html @@ -8,5 +8,5 @@ Move all cards to the foundations.

Quick Description

-Just like Thirty Six, +Just like Thirty-Six, but with two decks. diff --git a/html-src/rules/thirtysix.html b/html-src/rules/thirtysix.html index b51b04df..9820531a 100644 --- a/html-src/rules/thirtysix.html +++ b/html-src/rules/thirtysix.html @@ -1,4 +1,4 @@ -

Thirty Six

+

Thirty-Six

Klondike type. 1 deck. No redeal. diff --git a/html-src/rules/thirtytwocards.html b/html-src/rules/thirtytwocards.html index 6a59da04..02773696 100644 --- a/html-src/rules/thirtytwocards.html +++ b/html-src/rules/thirtytwocards.html @@ -1,4 +1,4 @@ -

Thirty Two Cards

+

Thirty-Two Cards

Two-Deck game type. 2 decks. No redeal. diff --git a/po/de_games.po b/po/de_games.po index 0d30d71e..19500068 100644 --- a/po/de_games.po +++ b/po/de_games.po @@ -1434,7 +1434,7 @@ msgstr "Glück" msgid "Forty Bandits" msgstr "" -msgid "Forty Nine" +msgid "Forty-Nine" msgstr "Neunundvierzig" msgid "Forty Thieves" @@ -4410,13 +4410,13 @@ msgstr "Dreizehn" msgid "Thirty" msgstr "Vierzig" -msgid "Thirty Six" +msgid "Thirty-Six" msgstr "Sechsunddreißig" -msgid "Thirty Six Card Tableau" +msgid "Thirty-Six Card Tableau" msgstr "" -msgid "Thirty Two Cards" +msgid "Thirty-Two Cards" msgstr "32 Karten" msgid "Thoughtful" diff --git a/po/fr_games.po b/po/fr_games.po index 6fb42497..292a52ec 100644 --- a/po/fr_games.po +++ b/po/fr_games.po @@ -1413,7 +1413,7 @@ msgstr "" msgid "Forty Bandits" msgstr "" -msgid "Forty Nine" +msgid "Forty-Nine" msgstr "" msgid "Forty Thieves" @@ -4344,13 +4344,13 @@ msgstr "" msgid "Thirty" msgstr "" -msgid "Thirty Six" +msgid "Thirty-Six" msgstr "" -msgid "Thirty Six Card Tableau" +msgid "Thirty-Six Card Tableau" msgstr "" -msgid "Thirty Two Cards" +msgid "Thirty-Two Cards" msgstr "" msgid "Thoughtful" diff --git a/po/games.pot b/po/games.pot index 5f0ef426..3af547f3 100644 --- a/po/games.pot +++ b/po/games.pot @@ -1416,7 +1416,7 @@ msgstr "" msgid "Forty Bandits" msgstr "" -msgid "Forty Nine" +msgid "Forty-Nine" msgstr "" msgid "Forty Thieves" @@ -4347,13 +4347,13 @@ msgstr "" msgid "Thirty" msgstr "" -msgid "Thirty Six" +msgid "Thirty-Six" msgstr "" -msgid "Thirty Six Card Tableau" +msgid "Thirty-Six Card Tableau" msgstr "" -msgid "Thirty Two Cards" +msgid "Thirty-Two Cards" msgstr "" msgid "Thoughtful" diff --git a/po/it_games.po b/po/it_games.po index 52e7564b..7d760f31 100644 --- a/po/it_games.po +++ b/po/it_games.po @@ -1418,7 +1418,7 @@ msgstr "" msgid "Forty Bandits" msgstr "" -msgid "Forty Nine" +msgid "Forty-Nine" msgstr "" msgid "Forty Thieves" @@ -4350,13 +4350,13 @@ msgstr "" msgid "Thirty" msgstr "" -msgid "Thirty Six" +msgid "Thirty-Six" msgstr "" -msgid "Thirty Six Card Tableau" +msgid "Thirty-Six Card Tableau" msgstr "" -msgid "Thirty Two Cards" +msgid "Thirty-Two Cards" msgstr "" msgid "Thoughtful" diff --git a/po/pl_games.po b/po/pl_games.po index 32a81c99..efaa1529 100644 --- a/po/pl_games.po +++ b/po/pl_games.po @@ -1423,7 +1423,7 @@ msgstr "" msgid "Forty Bandits" msgstr "" -msgid "Forty Nine" +msgid "Forty-Nine" msgstr "" msgid "Forty Thieves" @@ -4357,13 +4357,13 @@ msgstr "" msgid "Thirty" msgstr "" -msgid "Thirty Six" +msgid "Thirty-Six" msgstr "" -msgid "Thirty Six Card Tableau" +msgid "Thirty-Six Card Tableau" msgstr "" -msgid "Thirty Two Cards" +msgid "Thirty-Two Cards" msgstr "" msgid "Thoughtful" diff --git a/po/pt_BR_games.po b/po/pt_BR_games.po index 0036453b..a11f1588 100644 --- a/po/pt_BR_games.po +++ b/po/pt_BR_games.po @@ -1413,7 +1413,7 @@ msgstr "" msgid "Forty Bandits" msgstr "" -msgid "Forty Nine" +msgid "Forty-Nine" msgstr "" msgid "Forty Thieves" @@ -4344,13 +4344,13 @@ msgstr "" msgid "Thirty" msgstr "" -msgid "Thirty Six" +msgid "Thirty-Six" msgstr "" -msgid "Thirty Six Card Tableau" +msgid "Thirty-Six Card Tableau" msgstr "" -msgid "Thirty Two Cards" +msgid "Thirty-Two Cards" msgstr "" msgid "Thoughtful" diff --git a/po/ru_games.po b/po/ru_games.po index 6b2684d4..5dad3e4e 100644 --- a/po/ru_games.po +++ b/po/ru_games.po @@ -1439,7 +1439,7 @@ msgstr "Судьба" msgid "Forty Bandits" msgstr "" -msgid "Forty Nine" +msgid "Forty-Nine" msgstr "Сорок девять" msgid "Forty Thieves" @@ -4404,13 +4404,13 @@ msgstr "По тринадцать" msgid "Thirty" msgstr "Тридцать" -msgid "Thirty Six" +msgid "Thirty-Six" msgstr "Тридцать шесть" -msgid "Thirty Six Card Tableau" +msgid "Thirty-Six Card Tableau" msgstr "" -msgid "Thirty Two Cards" +msgid "Thirty-Two Cards" msgstr "Тридцать две карты" msgid "Thoughtful" diff --git a/pysollib/games/fortythieves.py b/pysollib/games/fortythieves.py index 6f86de1d..b7184424 100644 --- a/pysollib/games/fortythieves.py +++ b/pysollib/games/fortythieves.py @@ -1124,7 +1124,7 @@ class DoubleGoldMine(Streets): # * Interchange # * Unlimited # * Breakwater -# * Forty Nine +# * Forty-Nine # * Alternation # * Triple Interchange # ************************************************************************ @@ -1434,7 +1434,7 @@ registerGame(GameInfo(76, Streets, "Streets", GI.GT_FORTY_THIEVES, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(73, Maria, "Maria", GI.GT_FORTY_THIEVES, 2, 0, GI.SL_BALANCED, - altnames=("Maria Luisa", "Thirty Six Card Tableau"))) + altnames=("Maria Luisa", "Thirty-Six Card Tableau"))) registerGame(GameInfo(70, NumberTen, "Number Ten", GI.GT_FORTY_THIEVES, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(71, RankAndFile, "Rank and File", @@ -1516,7 +1516,7 @@ registerGame(GameInfo(575, Unlimited, "Unlimited", GI.GT_FORTY_THIEVES, 2, -1, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(576, Breakwater, "Breakwater", GI.GT_FORTY_THIEVES, 2, 0, GI.SL_MOSTLY_SKILL)) -registerGame(GameInfo(577, FortyNine, "Forty Nine", +registerGame(GameInfo(577, FortyNine, "Forty-Nine", GI.GT_FORTY_THIEVES, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(578, IndianPatience, "Indian Patience", GI.GT_FORTY_THIEVES, 2, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/golf.py b/pysollib/games/golf.py index a33559fc..3715dfec 100644 --- a/pysollib/games/golf.py +++ b/pysollib/games/golf.py @@ -885,7 +885,7 @@ class Waterfall(Game): # ************************************************************************ # * Vague -# * Thirty Two Cards +# * Thirty-Two Cards # ************************************************************************ class Vague_RowStack(BasicRowStack): @@ -1462,7 +1462,7 @@ registerGame(GameInfo(720, Vague, "Vague", registerGame(GameInfo(723, DevilsSolitaire, "Devil's Solitaire", GI.GT_2DECK_TYPE, 2, 2, GI.SL_BALANCED, altnames=('Banner',))) -registerGame(GameInfo(728, ThirtyTwoCards, "Thirty Two Cards", +registerGame(GameInfo(728, ThirtyTwoCards, "Thirty-Two Cards", GI.GT_2DECK_TYPE, 2, 0, GI.SL_LUCK)) registerGame(GameInfo(731, ThreeFirTrees, "Three Fir-trees", GI.GT_GOLF, 2, 0, GI.SL_BALANCED)) diff --git a/pysollib/games/klondike.py b/pysollib/games/klondike.py index 0f043b6b..cfb96d27 100644 --- a/pysollib/games/klondike.py +++ b/pysollib/games/klondike.py @@ -998,7 +998,7 @@ class Lanes(Klondike): # ************************************************************************ -# * Thirty Six +# * Thirty-Six # * Six By Six # * Taking Silk # ************************************************************************ @@ -1677,7 +1677,7 @@ registerGame(GameInfo(263, Phoenix, "Phoenix", # GI.GT_KLONDIKE, 2, 1, GI.SL_BALANCED)) registerGame(GameInfo(326, Lanes, "Lanes", GI.GT_KLONDIKE, 1, 1, GI.SL_BALANCED)) -registerGame(GameInfo(327, ThirtySix, "Thirty Six", +registerGame(GameInfo(327, ThirtySix, "Thirty-Six", GI.GT_KLONDIKE, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(350, Q_C_, "Q.C.", GI.GT_KLONDIKE, 2, 1, GI.SL_BALANCED))