Refactored pet display name changes

common/script/index.coffee

@@ -672,6 +672,14 @@ api.wrap = (user, main=true) ->
         [egg, potion] = pet.split('-')
         userPets = user.items.pets
 
+        # Generate pet display name variable
+        potionText = if content.hatchingPotions[potion] then content.hatchingPotions[potion].text() else potion
+        eggText = if content.eggs[egg] then content.eggs[egg].text() else egg
+        petDisplayName = i18n.t('petName', { 
+          potion: potionText
+          egg: eggText
+        })
+
         return cb?({code:404, message:i18n.t('messagePetNotFound', req.language)}) unless userPets[pet]
         return cb?({code:404, message:i18n.t('messageFoodNotFound', req.language)}) unless user.items.food?[food.key]
         return cb?({code:401, message:i18n.t('messageCannotFeedPet', req.language)}) if content.specialPets[pet] or (egg is "Egg")
@@ -683,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', {egg: egg, potion: potion}, req.language)
+          message = i18n.t('messageEvolve', {pet: petDisplayName}, req.language)
 
         if food.key is 'Saddle'
           evolve()
         else
           if food.target is potion
             userPets[pet] += 5
-            message = i18n.t('messageLikesFood', {egg: egg, potion: potion, foodText: food.text(req.language)}, req.language)
+            message = i18n.t('messageLikesFood', {pet: petDisplayName, foodText: food.text(req.language)}, req.language)
           else
             userPets[pet] += 2
-            message = i18n.t('messageDontEnjoyFood', {egg: egg, potion: potion, foodText: food.text(req.language)}, req.language)
+            message = i18n.t('messageDontEnjoyFood', {pet: petDisplayName, foodText: food.text(req.language)}, req.language)
           if userPets[pet] >= 50 and !user.items.mounts[pet]
             evolve()
         user.items.food[food.key]--