Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Donald Haase
Cockatrice
Commits
698e6cce
Commit
698e6cce
authored
Apr 15, 2015
by
poixen
Browse files
Merge pull request #950 from poixen/zone_grammar
Updated grammar based on #932
parents
aa95125f
a2aad95e
Changes
1
Show whitespace changes
Inline
Side-by-side
cockatrice/src/messagelogwidget.cpp
View file @
698e6cce
...
...
@@ -217,13 +217,13 @@ QPair<QString, QString> MessageLogWidget::getFromStr(CardZone *zone, QString car
QString
startName
=
zone
->
getName
();
if
(
startName
==
"table"
)
fromStr
=
tr
(
" from
table
"
);
fromStr
=
tr
(
" from
play
"
);
else
if
(
startName
==
"grave"
)
fromStr
=
tr
(
" from
graveyard"
);
fromStr
=
isFemale
(
zone
->
getPlayer
())
?
tr
(
" from her graveyard"
)
:
tr
(
" from his
graveyard"
);
else
if
(
startName
==
"rfg"
)
fromStr
=
tr
(
" from exile"
);
else
if
(
startName
==
"hand"
)
fromStr
=
tr
(
" from
hand"
);
fromStr
=
isFemale
(
zone
->
getPlayer
())
?
tr
(
" from her hand"
)
:
tr
(
" from his
hand"
);
else
if
(
startName
==
"deck"
)
{
if
(
position
>=
zone
->
getCards
().
size
()
-
1
)
{
if
(
cardName
.
isEmpty
())
{
...
...
@@ -303,11 +303,11 @@ void MessageLogWidget::doMoveCard(LogMoveCard &attributes)
else
finalStr
=
tr
(
"%1 puts %2 into play%3."
);
}
else
if
(
targetName
==
"grave"
)
finalStr
=
tr
(
"%1 puts %2%3 into
graveyard."
);
finalStr
=
isFemale
(
attributes
.
targetZone
->
getPlayer
())
?
tr
(
"%1 puts %2%3 into her graveyard."
)
:
tr
(
"%1 puts %2%3 into his
graveyard."
);
else
if
(
targetName
==
"rfg"
)
finalStr
=
tr
(
"%1 exiles %2%3."
);
else
if
(
targetName
==
"hand"
)
finalStr
=
tr
(
"%1 moves %2%3 to
hand."
);
finalStr
=
isFemale
(
attributes
.
targetZone
->
getPlayer
())
?
tr
(
"%1 moves %2%3 to her hand."
)
:
tr
(
"%1 moves %2%3 to his
hand."
);
else
if
(
targetName
==
"deck"
)
{
if
(
attributes
.
newX
==
-
1
)
finalStr
=
isFemale
(
attributes
.
targetZone
->
getPlayer
())
?
tr
(
"%1 puts %2%3 into her library."
)
:
tr
(
"%1 puts %2%3 into his library."
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment