jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-11-12 13:00:01 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Rename 'hisOwn' var to 'theirOwn' for zone messages

Browse source
This commit is contained in:
Gavin Bises 2015-01-28 19:00:55 -05:00
parent d069b65948
commit da16214010
2 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

42
cockatrice/src/cardzone.cpp
View file

@ -44,16 +44,16 @@ void CardZone::clearContents()
emit cardCountChanged(); emit cardCountChanged();
} }
QString CardZone::getTranslatedName(bool hisOwn, GrammaticalCase gc) const QString CardZone::getTranslatedName(bool theirOwn, GrammaticalCase gc) const
{ {
QString ownerName = player->getName(); QString ownerName = player->getName();
bool female = player->getUserInfo()->gender() == ServerInfo_User::Female; bool female = player->getUserInfo()->gender() == ServerInfo_User::Female;
if (name == "hand") if (name == "hand")
return female return female
? (hisOwn ? (theirOwn
? tr("her hand", "nominative, female owner") ? tr("her hand", "nominative, female owner")
: tr("%1's hand", "nominative, female owner").arg(ownerName) : tr("%1's hand", "nominative, female owner").arg(ownerName)
) : (hisOwn ) : (theirOwn
? tr("his hand", "nominative, male owner") ? tr("his hand", "nominative, male owner")
: tr("%1's hand", "nominative, male owner").arg(ownerName) : tr("%1's hand", "nominative, male owner").arg(ownerName)
); );
@ -61,65 +61,65 @@ QString CardZone::getTranslatedName(bool hisOwn, GrammaticalCase gc) const
switch (gc) { switch (gc) {
case CaseLookAtZone: case CaseLookAtZone:
return female return female
? (hisOwn ? (theirOwn
? tr("her library", "look at zone, female owner") ? tr("her library", "look at zone, female owner")
: tr("%1's library", "look at zone, female owner").arg(ownerName) : tr("%1's library", "look at zone, female owner").arg(ownerName)
) : (hisOwn ) : (theirOwn
? tr("his library", "look at zone, male owner") ? tr("his library", "look at zone, male owner")
: tr("%1's library", "look at zone, male owner").arg(ownerName) : tr("%1's library", "look at zone, male owner").arg(ownerName)
); );
case CaseTopCardsOfZone: case CaseTopCardsOfZone:
return female return female
? (hisOwn ? (theirOwn
? tr("of her library", "top cards of zone, female owner") ? tr("of her library", "top cards of zone, female owner")
: tr("of %1's library", "top cards of zone, female owner").arg(ownerName) : tr("of %1's library", "top cards of zone, female owner").arg(ownerName)
) : (hisOwn ) : (theirOwn
? tr("of his library", "top cards of zone, male owner") ? tr("of his library", "top cards of zone, male owner")
: tr("of %1's library", "top cards of zone, male owner").arg(ownerName) : tr("of %1's library", "top cards of zone, male owner").arg(ownerName)
); );
case CaseRevealZone: case CaseRevealZone:
return female return female
? (hisOwn ? (theirOwn
? tr("her library", "reveal zone, female owner") ? tr("her library", "reveal zone, female owner")
: tr("%1's library", "reveal zone, female owner").arg(ownerName) : tr("%1's library", "reveal zone, female owner").arg(ownerName)
) : (hisOwn ) : (theirOwn
? tr("his library", "reveal zone, male owner") ? tr("his library", "reveal zone, male owner")
: tr("%1's library", "reveal zone, male owner").arg(ownerName) : tr("%1's library", "reveal zone, male owner").arg(ownerName)
); );
case CaseShuffleZone: case CaseShuffleZone:
return female return female
? (hisOwn ? (theirOwn
? tr("her library", "shuffle, female owner") ? tr("her library", "shuffle, female owner")
: tr("%1's library", "shuffle, female owner").arg(ownerName) : tr("%1's library", "shuffle, female owner").arg(ownerName)
) : (hisOwn ) : (theirOwn
? tr("his library", "shuffle, male owner") ? tr("his library", "shuffle, male owner")
: tr("%1's library", "shuffle, male owner").arg(ownerName) : tr("%1's library", "shuffle, male owner").arg(ownerName)
); );
default: default:
return female return female
? (hisOwn ? (theirOwn
? tr("her library", "nominative, female owner") ? tr("her library", "nominative, female owner")
: tr("%1's library", "nominative, female owner").arg(ownerName) : tr("%1's library", "nominative, female owner").arg(ownerName)
) : (hisOwn ) : (theirOwn
? tr("his library", "nominative, male owner") ? tr("his library", "nominative, male owner")
: tr("%1's library", "nominative, male owner").arg(ownerName) : tr("%1's library", "nominative, male owner").arg(ownerName)
); );
} }
else if (name == "grave") else if (name == "grave")
return female return female
? (hisOwn ? (theirOwn
? tr("her graveyard", "nominative, female owner") ? tr("her graveyard", "nominative, female owner")
: tr("%1's graveyard", "nominative, female owner").arg(ownerName) : tr("%1's graveyard", "nominative, female owner").arg(ownerName)
) : (hisOwn ) : (theirOwn
? tr("his graveyard", "nominative, male owner") ? tr("his graveyard", "nominative, male owner")
: tr("%1's graveyard", "nominative, male owner").arg(ownerName) : tr("%1's graveyard", "nominative, male owner").arg(ownerName)
); );
else if (name == "rfg") else if (name == "rfg")
return female return female
? (hisOwn ? (theirOwn
? tr("her exile", "nominative, female owner") ? tr("her exile", "nominative, female owner")
: tr("%1's exile", "nominative, female owner").arg(ownerName) : tr("%1's exile", "nominative, female owner").arg(ownerName)
) : (hisOwn ) : (theirOwn
? tr("his exile", "nominative, male owner") ? tr("his exile", "nominative, male owner")
: tr("%1's exile", "nominative, male owner").arg(ownerName) : tr("%1's exile", "nominative, male owner").arg(ownerName)
); );
@ -127,19 +127,19 @@ QString CardZone::getTranslatedName(bool hisOwn, GrammaticalCase gc) const
switch (gc) { switch (gc) {
case CaseLookAtZone: case CaseLookAtZone:
return female return female
? (hisOwn ? (theirOwn
? tr("her sideboard", "look at zone, female owner") ? tr("her sideboard", "look at zone, female owner")
: tr("%1's sideboard", "look at zone, female owner").arg(ownerName) : tr("%1's sideboard", "look at zone, female owner").arg(ownerName)
) : (hisOwn ) : (theirOwn
? tr("his sideboard", "look at zone, male owner") ? tr("his sideboard", "look at zone, male owner")
: tr("%1's sideboard", "look at zone, male owner").arg(ownerName) : tr("%1's sideboard", "look at zone, male owner").arg(ownerName)
); );
case CaseNominative: case CaseNominative:
return female return female
? (hisOwn ? (theirOwn
? tr("her sideboard", "nominative, female owner") ? tr("her sideboard", "nominative, female owner")
: tr("%1's sideboard", "nominative, female owner").arg(ownerName) : tr("%1's sideboard", "nominative, female owner").arg(ownerName)
) : (hisOwn ) : (theirOwn
? tr("his sideboard", "nominative, male owner") ? tr("his sideboard", "nominative, male owner")
: tr("%1's sideboard", "nominative, male owner").arg(ownerName) : tr("%1's sideboard", "nominative, male owner").arg(ownerName)
); );

2
cockatrice/src/cardzone.h
View file

@ -47,7 +47,7 @@ public:
QMenu *getMenu() const { return menu; } QMenu *getMenu() const { return menu; }
void setMenu(QMenu *_menu, QAction *_doubleClickAction = 0) { menu = _menu; doubleClickAction = _doubleClickAction; } void setMenu(QMenu *_menu, QAction *_doubleClickAction = 0) { menu = _menu; doubleClickAction = _doubleClickAction; }
QString getName() const { return name; } QString getName() const { return name; }
QString getTranslatedName(bool hisOwn, GrammaticalCase gc) const; QString getTranslatedName(bool theirOwn, GrammaticalCase gc) const;
Player *getPlayer() const { return player; } Player *getPlayer() const { return player; }
bool contentsKnown() const { return cards.getContentsKnown(); } bool contentsKnown() const { return cards.getContentsKnown(); }
const CardList &getCards() const { return cards; } const CardList &getCards() const { return cards; }