From 016e359690cd7a51f9a0a1ba27fa54f7d81bff68 Mon Sep 17 00:00:00 2001
From: Blade Barringer <blade@crookedneighbor.com>
Date: Tue, 24 Feb 2015 16:58:48 -0600
Subject: [PATCH] Fixes #4749

---
 common/dist/scripts/habitrpg-shared.js | 6 +++---
 common/locales/en/messages.json        | 6 +++---
 common/script/index.coffee             | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/common/dist/scripts/habitrpg-shared.js b/common/dist/scripts/habitrpg-shared.js
index d2209863f4..b14aa9b725 100644
--- a/common/dist/scripts/habitrpg-shared.js
+++ b/common/dist/scripts/habitrpg-shared.js
@@ -5864,7 +5864,7 @@ api.wrap = function(user, main) {
             user.items.currentPet = "";
           }
           return message = i18n.t('messageEvolve', {
-            pet: petDisplayName
+            egg: petDisplayName
           }, req.language);
         };
         if (food.key === 'Saddle') {
@@ -5873,13 +5873,13 @@ api.wrap = function(user, main) {
           if (food.target === potion) {
             userPets[pet] += 5;
             message = i18n.t('messageLikesFood', {
-              pet: petDisplayName,
+              egg: petDisplayName,
               foodText: food.text(req.language)
             }, req.language);
           } else {
             userPets[pet] += 2;
             message = i18n.t('messageDontEnjoyFood', {
-              pet: petDisplayName,
+              egg: petDisplayName,
               foodText: food.text(req.language)
             }, req.language);
           }
diff --git a/common/locales/en/messages.json b/common/locales/en/messages.json
index 3b8e877264..e14f302fe0 100644
--- a/common/locales/en/messages.json
+++ b/common/locales/en/messages.json
@@ -6,9 +6,9 @@
   "messageFoodNotFound": ":food not found in user.items.food",
   "messageCannotFeedPet": "Can't feed this pet.",
   "messageAlreadyMount": "You already have that mount. Try feeding another pet.",
-  "messageEvolve": "You have tamed <%= pet %>, let's go for a ride!",
-  "messageLikesFood": "<%= pet %> really likes the <%= foodText %>!",
-  "messageDontEnjoyFood": "<%= pet %> eats the <%= foodText %> but doesn't seem to enjoy it.",
+  "messageEvolve": "You have tamed <%= egg %>, let's go for a ride!",
+  "messageLikesFood": "<%= egg %> really likes the <%= foodText %>!",
+  "messageDontEnjoyFood": "<%= egg %> eats the <%= foodText %> but doesn't seem to enjoy it.",
   "messageBought": "Bought <%= itemText %>",
   "messageEquipped": " <%= itemText %> equipped.",
   "messageUnEquipped": "<%= itemText %> un-equipped.",
diff --git a/common/script/index.coffee b/common/script/index.coffee
index 4ed72d3ef4..03684dbb46 100644
--- a/common/script/index.coffee
+++ b/common/script/index.coffee
@@ -691,17 +691,17 @@ api.wrap = (user, main=true) ->
           # changed to -1 to mark "owned" pets
           user.items.mounts[pet] = true
           user.items.currentPet = "" if pet is user.items.currentPet
-          message = i18n.t('messageEvolve', {pet: petDisplayName}, req.language)
+          message = i18n.t('messageEvolve', {egg: petDisplayName}, req.language)
 
         if food.key is 'Saddle'
           evolve()
         else
           if food.target is potion
             userPets[pet] += 5
-            message = i18n.t('messageLikesFood', {pet: petDisplayName, foodText: food.text(req.language)}, req.language)
+            message = i18n.t('messageLikesFood', {egg: petDisplayName, foodText: food.text(req.language)}, req.language)
           else
             userPets[pet] += 2
-            message = i18n.t('messageDontEnjoyFood', {pet: petDisplayName, foodText: food.text(req.language)}, req.language)
+            message = i18n.t('messageDontEnjoyFood', {egg: petDisplayName, foodText: food.text(req.language)}, req.language)
           if userPets[pet] >= 50 and !user.items.mounts[pet]
             evolve()
         user.items.food[food.key]--