From 6e39cc382352f32a9d6f4dd06f6b7d6235c93595 Mon Sep 17 00:00:00 2001
From: Matt Lowe <matthewneillowe@gmail.com>
Date: Sun, 12 Apr 2015 17:00:43 +0200
Subject: [PATCH 1/2] Updated grammar based on #932

Based on #932 I have added pronouns the the graveyard and hand, and also
changed "from play" to "from battlefield"
---
 cockatrice/src/messagelogwidget.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cockatrice/src/messagelogwidget.cpp b/cockatrice/src/messagelogwidget.cpp
index ef1588ec..b910db3a 100644
--- a/cockatrice/src/messagelogwidget.cpp
+++ b/cockatrice/src/messagelogwidget.cpp
@@ -217,7 +217,7 @@ QPair<QString, QString> MessageLogWidget::getFromStr(CardZone *zone, QString car
     QString startName = zone->getName();
     
     if (startName == "table")
-        fromStr = tr(" from table");
+        fromStr = tr(" from battlefield");
     else if (startName == "grave")
         fromStr = tr(" from graveyard");
     else if (startName == "rfg")
@@ -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.");

From a2aad95ede63cefb258fb63ead17789dff11c901 Mon Sep 17 00:00:00 2001
From: Matt Lowe <matthewneillowe@gmail.com>
Date: Sun, 12 Apr 2015 21:52:17 +0200
Subject: [PATCH 2/2] Added missing checks

---
 cockatrice/src/messagelogwidget.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cockatrice/src/messagelogwidget.cpp b/cockatrice/src/messagelogwidget.cpp
index b910db3a..f42a536f 100644
--- a/cockatrice/src/messagelogwidget.cpp
+++ b/cockatrice/src/messagelogwidget.cpp
@@ -217,13 +217,13 @@ QPair<QString, QString> MessageLogWidget::getFromStr(CardZone *zone, QString car
     QString startName = zone->getName();
     
     if (startName == "table")
-        fromStr = tr(" from battlefield");
+        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()) {