mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-04-27 07:48:01 -07:00
merge fix
This commit is contained in:
commit
82bc4274ae
16 changed files with 186 additions and 23 deletions
|
|
@ -169,6 +169,8 @@ QPair<QString, QString> MessageLogWidget::getFromStr(CardZone *zone, QString car
|
|||
fromStr = tr(" from library");
|
||||
} else if (startName == "sb")
|
||||
fromStr = tr(" from sideboard");
|
||||
else if (startName == "stack")
|
||||
fromStr = tr(" from the stack");
|
||||
|
||||
if (!cardNameContainsStartZone)
|
||||
cardName.clear();
|
||||
|
|
@ -209,6 +211,8 @@ void MessageLogWidget::logMoveCard(Player *player, QString cardName, CardZone *s
|
|||
finalStr = tr("%1 puts %2%3 into his library at position %4.");
|
||||
} else if (targetName == "sb")
|
||||
finalStr = tr("%1 moves %2%3 to sideboard.");
|
||||
else if (targetName == "stack")
|
||||
finalStr = tr("%1 plays %2%3.");
|
||||
|
||||
QString cardStr;
|
||||
if (cardNameContainsStartZone)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue