add correct message for equipping equipment

Currently, when you put on equipment, you see the messageBought notification. There was no messageEquipped notification in the code so I've added one.

I've updated ALL locale files IN ENGLISH, following the convention already in place for using English when there is no translation (e.g., locales/pl/messages.json, locales/sv/messages.json).
This commit is contained in:
Alice Harris 2014-05-18 10:45:24 +10:00
parent 3f9daafb8e
commit 7edeb53cda
17 changed files with 33 additions and 18 deletions

View file

@ -12967,7 +12967,7 @@ api.wrap = function(user, main) {
item = content.gear.flat[key]; item = content.gear.flat[key];
if (user.items.gear[type][item.type] === key) { if (user.items.gear[type][item.type] === key) {
user.items.gear[type][item.type] = "" + item.type + "_base_0"; user.items.gear[type][item.type] = "" + item.type + "_base_0";
message = i18n.t('messageBought', { message = i18n.t('messageEquipped', {
itemText: item.text(req.language) itemText: item.text(req.language)
}, req.language); }, req.language);
} else { } else {
@ -13834,4 +13834,4 @@ api.wrap = function(user, main) {
}).call(this,require("/Users/lefnire/Dropbox/Sites/habitrpg/modules/habitrpg-shared/node_modules/browserify/node_modules/insert-module-globals/node_modules/process/browser.js")) }).call(this,require("/Users/lefnire/Dropbox/Sites/habitrpg/modules/habitrpg-shared/node_modules/browserify/node_modules/insert-module-globals/node_modules/process/browser.js"))
},{"./content.coffee":5,"./i18n.coffee":6,"/Users/lefnire/Dropbox/Sites/habitrpg/modules/habitrpg-shared/node_modules/browserify/node_modules/insert-module-globals/node_modules/process/browser.js":2,"lodash":3,"moment":4}]},{},[1]) },{"./content.coffee":5,"./i18n.coffee":6,"/Users/lefnire/Dropbox/Sites/habitrpg/modules/habitrpg-shared/node_modules/browserify/node_modules/insert-module-globals/node_modules/process/browser.js":2,"lodash":3,"moment":4}]},{},[1])

View file

@ -10,6 +10,7 @@
"messageLikesFood": "<%= egg %> opravdu chutná <%= foodText %>!", "messageLikesFood": "<%= egg %> opravdu chutná <%= foodText %>!",
"messageDontEnjoyFood": "<%= egg %> snědl <%= foodText %>, ale nevypadá, že by mu to chutnalo.", "messageDontEnjoyFood": "<%= egg %> snědl <%= foodText %>, ale nevypadá, že by mu to chutnalo.",
"messageBought": "Koupils <%= itemText %>", "messageBought": "Koupils <%= itemText %>",
"messageEquipped": " <%= itemText %> equipped.",
"messageUnEquipped": " <%= itemText %> nevybaven.", "messageUnEquipped": " <%= itemText %> nevybaven.",
"messageMissingEggPotion": "Chybí ti buď to vejce nebo ten lektvar", "messageMissingEggPotion": "Chybí ti buď to vejce nebo ten lektvar",
"messageAlreadyPet": "Už tohoto mazlíčka máš. Zkus vylíhnout jinou kombinaci.", "messageAlreadyPet": "Už tohoto mazlíčka máš. Zkus vylíhnout jinou kombinaci.",
@ -20,4 +21,4 @@
"messageDropEgg": "Našel jsi vejce, ze kterého se vylíhne <%= dropText %> ! <%= dropNotes %>", "messageDropEgg": "Našel jsi vejce, ze kterého se vylíhne <%= dropText %> ! <%= dropNotes %>",
"messageDropPotion": "Našel jsi <%= dropText %> líhnoucí lektvar! <%= dropNotes %>", "messageDropPotion": "Našel jsi <%= dropText %> líhnoucí lektvar! <%= dropNotes %>",
"messageFoundQuest": "Našel jsi výpravu \"<%= questText %>\"!" "messageFoundQuest": "Našel jsi výpravu \"<%= questText %>\"!"
} }

View file

@ -10,6 +10,7 @@
"messageLikesFood": "<%= egg %> ist begeistert. <%= foodText %> ist seine Lieblingsspeise!", "messageLikesFood": "<%= egg %> ist begeistert. <%= foodText %> ist seine Lieblingsspeise!",
"messageDontEnjoyFood": "<%= egg %> ist von <%= foodText %> nicht gerade befeister, aber würgt es hinunter.", "messageDontEnjoyFood": "<%= egg %> ist von <%= foodText %> nicht gerade befeister, aber würgt es hinunter.",
"messageBought": "<%= itemText %> gekauft", "messageBought": "<%= itemText %> gekauft",
"messageEquipped": " <%= itemText %> equipped.",
"messageUnEquipped": "<%= itemText %> abgelegt.", "messageUnEquipped": "<%= itemText %> abgelegt.",
"messageMissingEggPotion": "Dir fehlt entweder dieses Ei oder dieser Trank", "messageMissingEggPotion": "Dir fehlt entweder dieses Ei oder dieser Trank",
"messageAlreadyPet": "Du hast dieses Haustier bereits. Versuche doch eine andere Kombination.", "messageAlreadyPet": "Du hast dieses Haustier bereits. Versuche doch eine andere Kombination.",
@ -20,4 +21,4 @@
"messageDropEgg": "Du hast ein <%= dropText %> Ei gefunden! <%= dropNotes %>", "messageDropEgg": "Du hast ein <%= dropText %> Ei gefunden! <%= dropNotes %>",
"messageDropPotion": "Du hast einen <%= dropText %> Schlüpftrank gefunden! <%= dropNotes %>", "messageDropPotion": "Du hast einen <%= dropText %> Schlüpftrank gefunden! <%= dropNotes %>",
"messageFoundQuest": "Du hast das Quest \"<%= questText %>\" gefunden!" "messageFoundQuest": "Du hast das Quest \"<%= questText %>\" gefunden!"
} }

View file

@ -10,6 +10,7 @@
"messageLikesFood": "<%= egg %> really likes the <%= foodText %>!", "messageLikesFood": "<%= egg %> really likes the <%= foodText %>!",
"messageDontEnjoyFood": "<%= egg %> eats the <%= foodText %> but doesn't seem to enjoy it.", "messageDontEnjoyFood": "<%= egg %> eats the <%= foodText %> but doesn't seem to enjoy it.",
"messageBought": "Bought <%= itemText %>", "messageBought": "Bought <%= itemText %>",
"messageEquipped": " <%= itemText %> equipped.",
"messageUnEquipped": "<%= itemText %> un-equipped.", "messageUnEquipped": "<%= itemText %> un-equipped.",
"messageMissingEggPotion": "You're missing either that egg or that potion", "messageMissingEggPotion": "You're missing either that egg or that potion",
"messageAlreadyPet": "You already have that pet. Try hatching a different combination!", "messageAlreadyPet": "You already have that pet. Try hatching a different combination!",
@ -20,4 +21,4 @@
"messageDropEgg": "You've found a <%= dropText %> Egg! <%= dropNotes %>", "messageDropEgg": "You've found a <%= dropText %> Egg! <%= dropNotes %>",
"messageDropPotion": "You've found a <%= dropText %> Hatching Potion! <%= dropNotes %>", "messageDropPotion": "You've found a <%= dropText %> Hatching Potion! <%= dropNotes %>",
"messageFoundQuest": "You've found the quest \"<%= questText %>\"!" "messageFoundQuest": "You've found the quest \"<%= questText %>\"!"
} }

View file

@ -10,6 +10,7 @@
"messageLikesFood": "¡A <%= egg %> le encanta <%= foodText %>!", "messageLikesFood": "¡A <%= egg %> le encanta <%= foodText %>!",
"messageDontEnjoyFood": "<%= egg %> come <%= foodText %> pero no parece disfrutarlo.", "messageDontEnjoyFood": "<%= egg %> come <%= foodText %> pero no parece disfrutarlo.",
"messageBought": "Has comprado <%= itemText %>", "messageBought": "Has comprado <%= itemText %>",
"messageEquipped": " <%= itemText %> equipped.",
"messageUnEquipped": "Has desequipado <%= itemText %>", "messageUnEquipped": "Has desequipado <%= itemText %>",
"messageMissingEggPotion": "No tienes ese huevo o pocion", "messageMissingEggPotion": "No tienes ese huevo o pocion",
"messageAlreadyPet": "¡Ya tienes esa mascota, intenta una combinacion diferente!", "messageAlreadyPet": "¡Ya tienes esa mascota, intenta una combinacion diferente!",
@ -20,4 +21,4 @@
"messageDropEgg": "¡Has encontrado un huevo de <%= dropText %>! <%= dropNotes %>", "messageDropEgg": "¡Has encontrado un huevo de <%= dropText %>! <%= dropNotes %>",
"messageDropPotion": "¡Has encontrado una pocion de eclosion de <%= dropText %>! <%= dropNotes %>", "messageDropPotion": "¡Has encontrado una pocion de eclosion de <%= dropText %>! <%= dropNotes %>",
"messageFoundQuest": "¡Has encontrado la mision \"<%= questText %>\"!" "messageFoundQuest": "¡Has encontrado la mision \"<%= questText %>\"!"
} }

View file

@ -10,6 +10,7 @@
"messageLikesFood": "<%= egg %> apprécie vraiment le/la <%= foodText %> !", "messageLikesFood": "<%= egg %> apprécie vraiment le/la <%= foodText %> !",
"messageDontEnjoyFood": "<%= egg %> mange le/la <%= foodText %> mais il n'a pas l'air d'aimer ça.", "messageDontEnjoyFood": "<%= egg %> mange le/la <%= foodText %> mais il n'a pas l'air d'aimer ça.",
"messageBought": "Vous avez acheté <%= itemText %>.", "messageBought": "Vous avez acheté <%= itemText %>.",
"messageEquipped": " <%= itemText %> equipped.",
"messageUnEquipped": "<%= itemText %> retiré·e·s.", "messageUnEquipped": "<%= itemText %> retiré·e·s.",
"messageMissingEggPotion": "Il vous manque cet œuf ou cette potion.", "messageMissingEggPotion": "Il vous manque cet œuf ou cette potion.",
"messageAlreadyPet": "Vous avez déjà ce familier. Essayez de faire éclore une combinaison différente !", "messageAlreadyPet": "Vous avez déjà ce familier. Essayez de faire éclore une combinaison différente !",
@ -20,4 +21,4 @@
"messageDropEgg": "Vous avez trouvé un Œuf de <%= dropText %> ! <%= dropNotes %>", "messageDropEgg": "Vous avez trouvé un Œuf de <%= dropText %> ! <%= dropNotes %>",
"messageDropPotion": "Vous avez trouvé une Potion dÉclosion <%= dropText %> ! <%= dropNotes %>", "messageDropPotion": "Vous avez trouvé une Potion dÉclosion <%= dropText %> ! <%= dropNotes %>",
"messageFoundQuest": "Vous avez trouvé la quête \"<%= questText %>\" !" "messageFoundQuest": "Vous avez trouvé la quête \"<%= questText %>\" !"
} }

View file

@ -10,6 +10,7 @@
"messageLikesFood": "<%= egg %> נהנה לאכול <%= foodText %>!", "messageLikesFood": "<%= egg %> נהנה לאכול <%= foodText %>!",
"messageDontEnjoyFood": "<%= egg %> אוכל את ה<%= foodText %> אבל לא נראה שהוא נהנה במיוחד.", "messageDontEnjoyFood": "<%= egg %> אוכל את ה<%= foodText %> אבל לא נראה שהוא נהנה במיוחד.",
"messageBought": "קנית <%= itemText %>", "messageBought": "קנית <%= itemText %>",
"messageEquipped": " <%= itemText %> equipped.",
"messageUnEquipped": "הפסקת להשתמש ב<%= itemText %>", "messageUnEquipped": "הפסקת להשתמש ב<%= itemText %>",
"messageMissingEggPotion": "חסרה לך הביצה או התרופה הזו", "messageMissingEggPotion": "חסרה לך הביצה או התרופה הזו",
"messageAlreadyPet": "כבר השגת חיית מחמד זו. נסה/י שילוב אחר!", "messageAlreadyPet": "כבר השגת חיית מחמד זו. נסה/י שילוב אחר!",
@ -20,4 +21,4 @@
"messageDropEgg": "מצאת ביצת <%= dropText %>! <%= dropNotes %>", "messageDropEgg": "מצאת ביצת <%= dropText %>! <%= dropNotes %>",
"messageDropPotion": "מצאת שיקוי <%= dropText %> לבקיעה! <%= dropNotes %>", "messageDropPotion": "מצאת שיקוי <%= dropText %> לבקיעה! <%= dropNotes %>",
"messageFoundQuest": "מצאת את המשימה \"<%= questText %>\"!" "messageFoundQuest": "מצאת את המשימה \"<%= questText %>\"!"
} }

View file

@ -10,6 +10,7 @@
"messageLikesFood": "<%= egg %> apprezza <%= foodText %>!", "messageLikesFood": "<%= egg %> apprezza <%= foodText %>!",
"messageDontEnjoyFood": "<%= egg %> mangia <%= foodText %>, ma non sembra piacergli molto.", "messageDontEnjoyFood": "<%= egg %> mangia <%= foodText %>, ma non sembra piacergli molto.",
"messageBought": "Hai comprato <%= itemText %>", "messageBought": "Hai comprato <%= itemText %>",
"messageEquipped": " <%= itemText %> equipped.",
"messageUnEquipped": "<%= itemText %> non è più equipaggiato.", "messageUnEquipped": "<%= itemText %> non è più equipaggiato.",
"messageMissingEggPotion": "Ti manca un uovo o una pozione.", "messageMissingEggPotion": "Ti manca un uovo o una pozione.",
"messageAlreadyPet": "Possiedi già quell'animale. Prova un'altra combinazione!", "messageAlreadyPet": "Possiedi già quell'animale. Prova un'altra combinazione!",
@ -20,4 +21,4 @@
"messageDropEgg": "Hai trovato un Uovo <%= dropText %>! <%= dropNotes %>", "messageDropEgg": "Hai trovato un Uovo <%= dropText %>! <%= dropNotes %>",
"messageDropPotion": "Hai trovato una Pozione di Schiusura <%= dropText %>! <%= dropNotes %>", "messageDropPotion": "Hai trovato una Pozione di Schiusura <%= dropText %>! <%= dropNotes %>",
"messageFoundQuest": "Hai trovato la missione \"<%= questText %>\"!" "messageFoundQuest": "Hai trovato la missione \"<%= questText %>\"!"
} }

View file

@ -10,6 +10,7 @@
"messageLikesFood": "<%= egg %> vindt <%= foodText %> echt heel lekker!", "messageLikesFood": "<%= egg %> vindt <%= foodText %> echt heel lekker!",
"messageDontEnjoyFood": "<%= egg %> eet <%= foodText %> maar lijkt er niet echt van te smullen.", "messageDontEnjoyFood": "<%= egg %> eet <%= foodText %> maar lijkt er niet echt van te smullen.",
"messageBought": "Kocht <%= itemText %>", "messageBought": "Kocht <%= itemText %>",
"messageEquipped": " <%= itemText %> equipped.",
"messageUnEquipped": "<%= itemText %> afgedaan.", "messageUnEquipped": "<%= itemText %> afgedaan.",
"messageMissingEggPotion": "Je mist of dat ei, of dat drankje.", "messageMissingEggPotion": "Je mist of dat ei, of dat drankje.",
"messageAlreadyPet": "Je hebt dat dier al. Probeer een andere combinatie uit te laten komen!", "messageAlreadyPet": "Je hebt dat dier al. Probeer een andere combinatie uit te laten komen!",
@ -20,4 +21,4 @@
"messageDropEgg": "Je vond een <%= dropText %> Ei! <%= dropNotes %>", "messageDropEgg": "Je vond een <%= dropText %> Ei! <%= dropNotes %>",
"messageDropPotion": "Je vond een <%= dropText %> Broed Drankje! <%= dropNotes %>", "messageDropPotion": "Je vond een <%= dropText %> Broed Drankje! <%= dropNotes %>",
"messageFoundQuest": "Je vond de queeste \"<%= questText %>\"!" "messageFoundQuest": "Je vond de queeste \"<%= questText %>\"!"
} }

View file

@ -10,6 +10,7 @@
"messageLikesFood": "<%= egg %> really likes the <%= foodText %>!", "messageLikesFood": "<%= egg %> really likes the <%= foodText %>!",
"messageDontEnjoyFood": "<%= egg %> eats the <%= foodText %> but doesn't seem to enjoy it.", "messageDontEnjoyFood": "<%= egg %> eats the <%= foodText %> but doesn't seem to enjoy it.",
"messageBought": "Bought <%= itemText %>", "messageBought": "Bought <%= itemText %>",
"messageEquipped": " <%= itemText %> equipped.",
"messageUnEquipped": "<%= itemText %> un-equipped.", "messageUnEquipped": "<%= itemText %> un-equipped.",
"messageMissingEggPotion": "You're missing either that egg or that potion", "messageMissingEggPotion": "You're missing either that egg or that potion",
"messageAlreadyPet": "You already have that pet. Try hatching a different combination!", "messageAlreadyPet": "You already have that pet. Try hatching a different combination!",
@ -20,4 +21,4 @@
"messageDropEgg": "You've found a <%= dropText %> Egg! <%= dropNotes %>", "messageDropEgg": "You've found a <%= dropText %> Egg! <%= dropNotes %>",
"messageDropPotion": "You've found a <%= dropText %> Hatching Potion! <%= dropNotes %>", "messageDropPotion": "You've found a <%= dropText %> Hatching Potion! <%= dropNotes %>",
"messageFoundQuest": "You've found the quest \"<%= questText %>\"!" "messageFoundQuest": "You've found the quest \"<%= questText %>\"!"
} }

View file

@ -10,6 +10,7 @@
"messageLikesFood": "<%= egg %> gostou muito de <%= foodText %>!", "messageLikesFood": "<%= egg %> gostou muito de <%= foodText %>!",
"messageDontEnjoyFood": "<%= egg %> comeu <%= foodText %>, mas parece não gostar muito.", "messageDontEnjoyFood": "<%= egg %> comeu <%= foodText %>, mas parece não gostar muito.",
"messageBought": "Comprou <%= itemText %>", "messageBought": "Comprou <%= itemText %>",
"messageEquipped": " <%= itemText %> equipped.",
"messageUnEquipped": "<%= itemText %> desequipado.", "messageUnEquipped": "<%= itemText %> desequipado.",
"messageMissingEggPotion": "Está faltando o ovo ou a poção.", "messageMissingEggPotion": "Está faltando o ovo ou a poção.",
"messageAlreadyPet": "Você já possui esse mascote. Tente uma combinação diferente!", "messageAlreadyPet": "Você já possui esse mascote. Tente uma combinação diferente!",
@ -20,4 +21,4 @@
"messageDropEgg": "Você encontrou um Ovo de <%= dropText %>! <%= dropNotes %>", "messageDropEgg": "Você encontrou um Ovo de <%= dropText %>! <%= dropNotes %>",
"messageDropPotion": "Você encontrou uma Poção de Eclosão <%= dropText %>! <%= dropNotes %>", "messageDropPotion": "Você encontrou uma Poção de Eclosão <%= dropText %>! <%= dropNotes %>",
"messageFoundQuest": "Você encontrou a missão \"<%= questText %>\"!" "messageFoundQuest": "Você encontrou a missão \"<%= questText %>\"!"
} }

View file

@ -10,6 +10,7 @@
"messageLikesFood": "<%= egg %> adoră să mănânce <%= foodText %>!", "messageLikesFood": "<%= egg %> adoră să mănânce <%= foodText %>!",
"messageDontEnjoyFood": "<%= egg %> mănîncă <%= foodText %>, dar se pare că nu îi place.", "messageDontEnjoyFood": "<%= egg %> mănîncă <%= foodText %>, dar se pare că nu îi place.",
"messageBought": "Ai cumpărat <%= itemText %>", "messageBought": "Ai cumpărat <%= itemText %>",
"messageEquipped": " <%= itemText %> equipped.",
"messageUnEquipped": "<%= itemText %> dezechipat.", "messageUnEquipped": "<%= itemText %> dezechipat.",
"messageMissingEggPotion": "Îţi lipseşte ori oul ori poţiunea necesară", "messageMissingEggPotion": "Îţi lipseşte ori oul ori poţiunea necesară",
"messageAlreadyPet": "Deja ai acest companion. Încearcă o altă combinaţie pentru eclozare!", "messageAlreadyPet": "Deja ai acest companion. Încearcă o altă combinaţie pentru eclozare!",
@ -20,4 +21,4 @@
"messageDropEgg": "Ai găsit un Ou <%= dropText %>! <%= dropNotes %>", "messageDropEgg": "Ai găsit un Ou <%= dropText %>! <%= dropNotes %>",
"messageDropPotion": "Ai găsit o poţiune de eclozare <%= dropText %>! <%= dropNotes %>", "messageDropPotion": "Ai găsit o poţiune de eclozare <%= dropText %>! <%= dropNotes %>",
"messageFoundQuest": "Ai găsit aventura \"<%= questText %>\"!" "messageFoundQuest": "Ai găsit aventura \"<%= questText %>\"!"
} }

View file

@ -10,6 +10,7 @@
"messageLikesFood": "<%= egg %> доволен. <%= foodText %> — его любимая еда!", "messageLikesFood": "<%= egg %> доволен. <%= foodText %> — его любимая еда!",
"messageDontEnjoyFood": "<%= egg %> все съел, но не похоже, что <%= foodText %> ему нравится.", "messageDontEnjoyFood": "<%= egg %> все съел, но не похоже, что <%= foodText %> ему нравится.",
"messageBought": "Куплено: <%= itemText %>", "messageBought": "Куплено: <%= itemText %>",
"messageEquipped": " <%= itemText %> equipped.",
"messageUnEquipped": "Снято: <%= itemText %>", "messageUnEquipped": "Снято: <%= itemText %>",
"messageMissingEggPotion": "У вас нет нужного яйца или эликсира", "messageMissingEggPotion": "У вас нет нужного яйца или эликсира",
"messageAlreadyPet": "У вас уже есть такой питомец! Попробуйте другую комбинацию!", "messageAlreadyPet": "У вас уже есть такой питомец! Попробуйте другую комбинацию!",
@ -20,4 +21,4 @@
"messageDropEgg": "Вы нашли: <%= dropText %> в яйце! <%= dropNotes %>", "messageDropEgg": "Вы нашли: <%= dropText %> в яйце! <%= dropNotes %>",
"messageDropPotion": "Вы нашли <%= dropText %> инкубационный эликсир! <%= dropNotes %>", "messageDropPotion": "Вы нашли <%= dropText %> инкубационный эликсир! <%= dropNotes %>",
"messageFoundQuest": "Вы нашли квест: «<%= questText %>»!" "messageFoundQuest": "Вы нашли квест: «<%= questText %>»!"
} }

View file

@ -10,6 +10,7 @@
"messageLikesFood": "<%= egg %> si pochutnalo na <%= foodText %>!", "messageLikesFood": "<%= egg %> si pochutnalo na <%= foodText %>!",
"messageDontEnjoyFood": "<%= egg %> zjedlo <%= foodText %>, ale veľmi mu to nechutí.", "messageDontEnjoyFood": "<%= egg %> zjedlo <%= foodText %>, ale veľmi mu to nechutí.",
"messageBought": "Kúpené: <%= itemText %>", "messageBought": "Kúpené: <%= itemText %>",
"messageEquipped": " <%= itemText %> equipped.",
"messageUnEquipped": "Zložené - <%= itemText %> . ", "messageUnEquipped": "Zložené - <%= itemText %> . ",
"messageMissingEggPotion": "Na túto kombináciu ti chýba buď vajíčko alebo liahoxír", "messageMissingEggPotion": "Na túto kombináciu ti chýba buď vajíčko alebo liahoxír",
"messageAlreadyPet": "Toto zvieratko už máš. Skús vyliahnuť inú kombináciu!", "messageAlreadyPet": "Toto zvieratko už máš. Skús vyliahnuť inú kombináciu!",
@ -20,4 +21,4 @@
"messageDropEgg": "Našiel si vajíčko: <%= dropText %>! <%= dropNotes %>", "messageDropEgg": "Našiel si vajíčko: <%= dropText %>! <%= dropNotes %>",
"messageDropPotion": "Našiel si liahoxír: <%= dropText %>! <%= dropNotes %>", "messageDropPotion": "Našiel si liahoxír: <%= dropText %>! <%= dropNotes %>",
"messageFoundQuest": "Našiel si zvitok s popisom výpravy: \"<%= questText %>\"!" "messageFoundQuest": "Našiel si zvitok s popisom výpravy: \"<%= questText %>\"!"
} }

View file

@ -10,6 +10,7 @@
"messageLikesFood": "<%= egg %> gillar verkligen <%= foodText %>!", "messageLikesFood": "<%= egg %> gillar verkligen <%= foodText %>!",
"messageDontEnjoyFood": "<%= egg %> eats the <%= foodText %> but doesn't seem to enjoy it.", "messageDontEnjoyFood": "<%= egg %> eats the <%= foodText %> but doesn't seem to enjoy it.",
"messageBought": "Bought <%= itemText %>", "messageBought": "Bought <%= itemText %>",
"messageEquipped": " <%= itemText %> equipped.",
"messageUnEquipped": "<%= itemText %> un-equipped.", "messageUnEquipped": "<%= itemText %> un-equipped.",
"messageMissingEggPotion": "You're missing either that egg or that potion", "messageMissingEggPotion": "You're missing either that egg or that potion",
"messageAlreadyPet": "You already have that pet. Try hatching a different combination!", "messageAlreadyPet": "You already have that pet. Try hatching a different combination!",
@ -20,4 +21,4 @@
"messageDropEgg": "You've found a <%= dropText %> Egg! <%= dropNotes %>", "messageDropEgg": "You've found a <%= dropText %> Egg! <%= dropNotes %>",
"messageDropPotion": "You've found a <%= dropText %> Hatching Potion! <%= dropNotes %>", "messageDropPotion": "You've found a <%= dropText %> Hatching Potion! <%= dropNotes %>",
"messageFoundQuest": "You've found the quest \"<%= questText %>\"!" "messageFoundQuest": "You've found the quest \"<%= questText %>\"!"
} }

View file

@ -10,6 +10,7 @@
"messageLikesFood": "<%= egg %> really likes the <%= foodText %>!", "messageLikesFood": "<%= egg %> really likes the <%= foodText %>!",
"messageDontEnjoyFood": "<%= egg %> eats the <%= foodText %> but doesn't seem to enjoy it.", "messageDontEnjoyFood": "<%= egg %> eats the <%= foodText %> but doesn't seem to enjoy it.",
"messageBought": "Bought <%= itemText %>", "messageBought": "Bought <%= itemText %>",
"messageEquipped": " <%= itemText %> equipped.",
"messageUnEquipped": "<%= itemText %> un-equipped.", "messageUnEquipped": "<%= itemText %> un-equipped.",
"messageMissingEggPotion": "You're missing either that egg or that potion", "messageMissingEggPotion": "You're missing either that egg or that potion",
"messageAlreadyPet": "You already have that pet. Try hatching a different combination!", "messageAlreadyPet": "You already have that pet. Try hatching a different combination!",
@ -20,4 +21,4 @@
"messageDropEgg": "You've found a <%= dropText %> Egg! <%= dropNotes %>", "messageDropEgg": "You've found a <%= dropText %> Egg! <%= dropNotes %>",
"messageDropPotion": "You've found a <%= dropText %> Hatching Potion! <%= dropNotes %>", "messageDropPotion": "You've found a <%= dropText %> Hatching Potion! <%= dropNotes %>",
"messageFoundQuest": "You've found the quest \"<%= questText %>\"!" "messageFoundQuest": "You've found the quest \"<%= questText %>\"!"
} }

View file

@ -649,7 +649,7 @@ api.wrap = (user, main=true) ->
item = content.gear.flat[key] item = content.gear.flat[key]
if user.items.gear[type][item.type] is key if user.items.gear[type][item.type] is key
user.items.gear[type][item.type] = "#{item.type}_base_0" user.items.gear[type][item.type] = "#{item.type}_base_0"
message = i18n.t('messageBought', {itemText: item.text(req.language)}, req.language) message = i18n.t('messageEquipped', {itemText: item.text(req.language)}, req.language)
else else
user.items.gear[type][item.type] = item.key user.items.gear[type][item.type] = item.key
message = user.fns.handleTwoHanded(item,type,req) message = user.fns.handleTwoHanded(item,type,req)