From 8a3e3cb155d3d0f031e7dc444189d717e11d2071 Mon Sep 17 00:00:00 2001 From: John Karahalis Date: Tue, 14 Aug 2012 00:10:25 -0400 Subject: [PATCH] Renamed the hand "Two Pairs" to "Two Pair". Nitpick, but the name of the hand is "Two Pair". https://en.wikipedia.org/wiki/Two_pair#Two_pair English is a funny language. This commit does not correct the name of the hand in any images (for example data/gfx/gui/table/default/handranking.png) because the corresponding GIMP templates do not have separate text layers, making them difficult to edit. --- src/engine/local_engine/cardsvalue.cpp | 6 +++--- src/gui/qt/gametable/mychancelabel.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/engine/local_engine/cardsvalue.cpp b/src/engine/local_engine/cardsvalue.cpp index d7f1bf31..4bd93f51 100755 --- a/src/engine/local_engine/cardsvalue.cpp +++ b/src/engine/local_engine/cardsvalue.cpp @@ -954,7 +954,7 @@ std::string CardsValue::determineHandName(int myCardsValueInt, PlayerList active } } break; - // Two Pairs + // Two Pair case 2: { handName = *cardStringIt_c; @@ -1775,9 +1775,9 @@ std::list CardsValue::translateCardsValueCode(int cardsValueCode) } } break; - // Two Pairs + // Two Pair case 2: { - cardString.push_back("Two Pairs, "); + cardString.push_back("Two Pair, "); // erster Pair switch(secondPart) { case 12: diff --git a/src/gui/qt/gametable/mychancelabel.cpp b/src/gui/qt/gametable/mychancelabel.cpp index 0868f110..98ef0612 100644 --- a/src/gui/qt/gametable/mychancelabel.cpp +++ b/src/gui/qt/gametable/mychancelabel.cpp @@ -180,7 +180,7 @@ void MyChanceLabel::paintEvent(QPaintEvent * /*event*/) } else { painter.setPen(possible); } - painter.drawText(QRectF(QPointF(2,start_y+7*height), QPointF(text_width,start_y+8*height)),Qt::AlignRight,"Two Pairs"); + painter.drawText(QRectF(QPointF(2,start_y+7*height), QPointF(text_width,start_y+8*height)),Qt::AlignRight,"Two Pair"); painter.drawText(QRectF(QPointF(percent_start,start_y+7*height), QPointF(percent_start+percent_width,start_y+8*height)),Qt::AlignRight,QString("%1%").arg(TPChance[0])); if(OPChance[1] == 0 || myFoldState) { painter.setPen(impossible);