From 7edeb53cda2b5df9cd3297b18b8bd9f6426261f1 Mon Sep 17 00:00:00 2001 From: Alice Harris Date: Sun, 18 May 2014 10:45:24 +1000 Subject: [PATCH] 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). --- dist/habitrpg-shared.js | 4 ++-- locales/cs/messages.json | 3 ++- locales/de/messages.json | 3 ++- locales/en/messages.json | 3 ++- locales/es/messages.json | 3 ++- locales/fr/messages.json | 3 ++- locales/he/messages.json | 3 ++- locales/it/messages.json | 3 ++- locales/nl/messages.json | 3 ++- locales/pl/messages.json | 3 ++- locales/pt/messages.json | 3 ++- locales/ro/messages.json | 3 ++- locales/ru/messages.json | 3 ++- locales/sk/messages.json | 3 ++- locales/sv/messages.json | 3 ++- locales/uk/messages.json | 3 ++- script/index.coffee | 2 +- 17 files changed, 33 insertions(+), 18 deletions(-) diff --git a/dist/habitrpg-shared.js b/dist/habitrpg-shared.js index 3f79c05f12..34f16f5b55 100644 --- a/dist/habitrpg-shared.js +++ b/dist/habitrpg-shared.js @@ -12967,7 +12967,7 @@ api.wrap = function(user, main) { item = content.gear.flat[key]; if (user.items.gear[type][item.type] === key) { user.items.gear[type][item.type] = "" + item.type + "_base_0"; - message = i18n.t('messageBought', { + message = i18n.t('messageEquipped', { itemText: item.text(req.language) }, req.language); } 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")) -},{"./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]) \ No newline at end of file +},{"./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]) diff --git a/locales/cs/messages.json b/locales/cs/messages.json index 464e790ea0..898e969e0e 100644 --- a/locales/cs/messages.json +++ b/locales/cs/messages.json @@ -10,6 +10,7 @@ "messageLikesFood": "<%= egg %> opravdu chutná <%= foodText %>!", "messageDontEnjoyFood": "<%= egg %> snědl <%= foodText %>, ale nevypadá, že by mu to chutnalo.", "messageBought": "Koupils <%= itemText %>", + "messageEquipped": " <%= itemText %> equipped.", "messageUnEquipped": " <%= itemText %> nevybaven.", "messageMissingEggPotion": "Chybí ti buď to vejce nebo ten lektvar", "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 %>", "messageDropPotion": "Našel jsi <%= dropText %> líhnoucí lektvar! <%= dropNotes %>", "messageFoundQuest": "Našel jsi výpravu \"<%= questText %>\"!" -} \ No newline at end of file +} diff --git a/locales/de/messages.json b/locales/de/messages.json index 2c1943a7e4..61e22e772e 100644 --- a/locales/de/messages.json +++ b/locales/de/messages.json @@ -10,6 +10,7 @@ "messageLikesFood": "<%= egg %> ist begeistert. <%= foodText %> ist seine Lieblingsspeise!", "messageDontEnjoyFood": "<%= egg %> ist von <%= foodText %> nicht gerade befeister, aber würgt es hinunter.", "messageBought": "<%= itemText %> gekauft", + "messageEquipped": " <%= itemText %> equipped.", "messageUnEquipped": "<%= itemText %> abgelegt.", "messageMissingEggPotion": "Dir fehlt entweder dieses Ei oder dieser Trank", "messageAlreadyPet": "Du hast dieses Haustier bereits. Versuche doch eine andere Kombination.", @@ -20,4 +21,4 @@ "messageDropEgg": "Du hast ein <%= dropText %> Ei gefunden! <%= dropNotes %>", "messageDropPotion": "Du hast einen <%= dropText %> Schlüpftrank gefunden! <%= dropNotes %>", "messageFoundQuest": "Du hast das Quest \"<%= questText %>\" gefunden!" -} \ No newline at end of file +} diff --git a/locales/en/messages.json b/locales/en/messages.json index 83fef38fe4..e14f302fe0 100644 --- a/locales/en/messages.json +++ b/locales/en/messages.json @@ -10,6 +10,7 @@ "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.", "messageMissingEggPotion": "You're missing either that egg or that potion", "messageAlreadyPet": "You already have that pet. Try hatching a different combination!", @@ -20,4 +21,4 @@ "messageDropEgg": "You've found a <%= dropText %> Egg! <%= dropNotes %>", "messageDropPotion": "You've found a <%= dropText %> Hatching Potion! <%= dropNotes %>", "messageFoundQuest": "You've found the quest \"<%= questText %>\"!" -} \ No newline at end of file +} diff --git a/locales/es/messages.json b/locales/es/messages.json index 6a4d8b8b37..851787d17c 100644 --- a/locales/es/messages.json +++ b/locales/es/messages.json @@ -10,6 +10,7 @@ "messageLikesFood": "¡A <%= egg %> le encanta <%= foodText %>!", "messageDontEnjoyFood": "<%= egg %> come <%= foodText %> pero no parece disfrutarlo.", "messageBought": "Has comprado <%= itemText %>", + "messageEquipped": " <%= itemText %> equipped.", "messageUnEquipped": "Has desequipado <%= itemText %>", "messageMissingEggPotion": "No tienes ese huevo o pocion", "messageAlreadyPet": "¡Ya tienes esa mascota, intenta una combinacion diferente!", @@ -20,4 +21,4 @@ "messageDropEgg": "¡Has encontrado un huevo de <%= dropText %>! <%= dropNotes %>", "messageDropPotion": "¡Has encontrado una pocion de eclosion de <%= dropText %>! <%= dropNotes %>", "messageFoundQuest": "¡Has encontrado la mision \"<%= questText %>\"!" -} \ No newline at end of file +} diff --git a/locales/fr/messages.json b/locales/fr/messages.json index b810e590e8..32ac27701e 100644 --- a/locales/fr/messages.json +++ b/locales/fr/messages.json @@ -10,6 +10,7 @@ "messageLikesFood": "<%= egg %> apprécie vraiment le/la <%= foodText %> !", "messageDontEnjoyFood": "<%= egg %> mange le/la <%= foodText %> mais il n'a pas l'air d'aimer ça.", "messageBought": "Vous avez acheté <%= itemText %>.", + "messageEquipped": " <%= itemText %> equipped.", "messageUnEquipped": "<%= itemText %> retiré·e·s.", "messageMissingEggPotion": "Il vous manque cet œuf ou cette potion.", "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 %>", "messageDropPotion": "Vous avez trouvé une Potion d’Éclosion <%= dropText %> ! <%= dropNotes %>", "messageFoundQuest": "Vous avez trouvé la quête \"<%= questText %>\" !" -} \ No newline at end of file +} diff --git a/locales/he/messages.json b/locales/he/messages.json index ce59503489..6d0730c43d 100644 --- a/locales/he/messages.json +++ b/locales/he/messages.json @@ -10,6 +10,7 @@ "messageLikesFood": "<%= egg %> נהנה לאכול <%= foodText %>!", "messageDontEnjoyFood": "<%= egg %> אוכל את ה<%= foodText %> אבל לא נראה שהוא נהנה במיוחד.", "messageBought": "קנית <%= itemText %>", + "messageEquipped": " <%= itemText %> equipped.", "messageUnEquipped": "הפסקת להשתמש ב<%= itemText %>", "messageMissingEggPotion": "חסרה לך הביצה או התרופה הזו", "messageAlreadyPet": "כבר השגת חיית מחמד זו. נסה/י שילוב אחר!", @@ -20,4 +21,4 @@ "messageDropEgg": "מצאת ביצת <%= dropText %>! <%= dropNotes %>", "messageDropPotion": "מצאת שיקוי <%= dropText %> לבקיעה! <%= dropNotes %>", "messageFoundQuest": "מצאת את המשימה \"<%= questText %>\"!" -} \ No newline at end of file +} diff --git a/locales/it/messages.json b/locales/it/messages.json index 0ffeea87a6..5e4b507b8c 100644 --- a/locales/it/messages.json +++ b/locales/it/messages.json @@ -10,6 +10,7 @@ "messageLikesFood": "<%= egg %> apprezza <%= foodText %>!", "messageDontEnjoyFood": "<%= egg %> mangia <%= foodText %>, ma non sembra piacergli molto.", "messageBought": "Hai comprato <%= itemText %>", + "messageEquipped": " <%= itemText %> equipped.", "messageUnEquipped": "<%= itemText %> non è più equipaggiato.", "messageMissingEggPotion": "Ti manca un uovo o una pozione.", "messageAlreadyPet": "Possiedi già quell'animale. Prova un'altra combinazione!", @@ -20,4 +21,4 @@ "messageDropEgg": "Hai trovato un Uovo <%= dropText %>! <%= dropNotes %>", "messageDropPotion": "Hai trovato una Pozione di Schiusura <%= dropText %>! <%= dropNotes %>", "messageFoundQuest": "Hai trovato la missione \"<%= questText %>\"!" -} \ No newline at end of file +} diff --git a/locales/nl/messages.json b/locales/nl/messages.json index 9a00556f78..da322a3fd4 100644 --- a/locales/nl/messages.json +++ b/locales/nl/messages.json @@ -10,6 +10,7 @@ "messageLikesFood": "<%= egg %> vindt <%= foodText %> echt heel lekker!", "messageDontEnjoyFood": "<%= egg %> eet <%= foodText %> maar lijkt er niet echt van te smullen.", "messageBought": "Kocht <%= itemText %>", + "messageEquipped": " <%= itemText %> equipped.", "messageUnEquipped": "<%= itemText %> afgedaan.", "messageMissingEggPotion": "Je mist of dat ei, of dat drankje.", "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 %>", "messageDropPotion": "Je vond een <%= dropText %> Broed Drankje! <%= dropNotes %>", "messageFoundQuest": "Je vond de queeste \"<%= questText %>\"!" -} \ No newline at end of file +} diff --git a/locales/pl/messages.json b/locales/pl/messages.json index 94b5018d1e..b56a496ff3 100644 --- a/locales/pl/messages.json +++ b/locales/pl/messages.json @@ -10,6 +10,7 @@ "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.", "messageMissingEggPotion": "You're missing either that egg or that potion", "messageAlreadyPet": "You already have that pet. Try hatching a different combination!", @@ -20,4 +21,4 @@ "messageDropEgg": "You've found a <%= dropText %> Egg! <%= dropNotes %>", "messageDropPotion": "You've found a <%= dropText %> Hatching Potion! <%= dropNotes %>", "messageFoundQuest": "You've found the quest \"<%= questText %>\"!" -} \ No newline at end of file +} diff --git a/locales/pt/messages.json b/locales/pt/messages.json index 9961c30eb8..435d97bf24 100644 --- a/locales/pt/messages.json +++ b/locales/pt/messages.json @@ -10,6 +10,7 @@ "messageLikesFood": "<%= egg %> gostou muito de <%= foodText %>!", "messageDontEnjoyFood": "<%= egg %> comeu <%= foodText %>, mas parece não gostar muito.", "messageBought": "Comprou <%= itemText %>", + "messageEquipped": " <%= itemText %> equipped.", "messageUnEquipped": "<%= itemText %> desequipado.", "messageMissingEggPotion": "Está faltando o ovo ou a poção.", "messageAlreadyPet": "Você já possui esse mascote. Tente uma combinação diferente!", @@ -20,4 +21,4 @@ "messageDropEgg": "Você encontrou um Ovo de <%= dropText %>! <%= dropNotes %>", "messageDropPotion": "Você encontrou uma Poção de Eclosão <%= dropText %>! <%= dropNotes %>", "messageFoundQuest": "Você encontrou a missão \"<%= questText %>\"!" -} \ No newline at end of file +} diff --git a/locales/ro/messages.json b/locales/ro/messages.json index 34580e91f4..6d28613a0d 100644 --- a/locales/ro/messages.json +++ b/locales/ro/messages.json @@ -10,6 +10,7 @@ "messageLikesFood": "<%= egg %> adoră să mănânce <%= foodText %>!", "messageDontEnjoyFood": "<%= egg %> mănîncă <%= foodText %>, dar se pare că nu îi place.", "messageBought": "Ai cumpărat <%= itemText %>", + "messageEquipped": " <%= itemText %> equipped.", "messageUnEquipped": "<%= itemText %> dezechipat.", "messageMissingEggPotion": "Îţi lipseşte ori oul ori poţiunea necesară", "messageAlreadyPet": "Deja ai acest companion. Încearcă o altă combinaţie pentru eclozare!", @@ -20,4 +21,4 @@ "messageDropEgg": "Ai găsit un Ou <%= dropText %>! <%= dropNotes %>", "messageDropPotion": "Ai găsit o poţiune de eclozare <%= dropText %>! <%= dropNotes %>", "messageFoundQuest": "Ai găsit aventura \"<%= questText %>\"!" -} \ No newline at end of file +} diff --git a/locales/ru/messages.json b/locales/ru/messages.json index 9e7b526bf8..39e0b9ecbc 100644 --- a/locales/ru/messages.json +++ b/locales/ru/messages.json @@ -10,6 +10,7 @@ "messageLikesFood": "<%= egg %> доволен. <%= foodText %> — его любимая еда!", "messageDontEnjoyFood": "<%= egg %> все съел, но не похоже, что <%= foodText %> ему нравится.", "messageBought": "Куплено: <%= itemText %>", + "messageEquipped": " <%= itemText %> equipped.", "messageUnEquipped": "Снято: <%= itemText %>", "messageMissingEggPotion": "У вас нет нужного яйца или эликсира", "messageAlreadyPet": "У вас уже есть такой питомец! Попробуйте другую комбинацию!", @@ -20,4 +21,4 @@ "messageDropEgg": "Вы нашли: <%= dropText %> в яйце! <%= dropNotes %>", "messageDropPotion": "Вы нашли <%= dropText %> инкубационный эликсир! <%= dropNotes %>", "messageFoundQuest": "Вы нашли квест: «<%= questText %>»!" -} \ No newline at end of file +} diff --git a/locales/sk/messages.json b/locales/sk/messages.json index c4c5fd9fe0..fcab9476be 100644 --- a/locales/sk/messages.json +++ b/locales/sk/messages.json @@ -10,6 +10,7 @@ "messageLikesFood": "<%= egg %> si pochutnalo na <%= foodText %>!", "messageDontEnjoyFood": "<%= egg %> zjedlo <%= foodText %>, ale veľmi mu to nechutí.", "messageBought": "Kúpené: <%= itemText %>", + "messageEquipped": " <%= itemText %> equipped.", "messageUnEquipped": "Zložené - <%= itemText %> . ", "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!", @@ -20,4 +21,4 @@ "messageDropEgg": "Našiel si vajíčko: <%= dropText %>! <%= dropNotes %>", "messageDropPotion": "Našiel si liahoxír: <%= dropText %>! <%= dropNotes %>", "messageFoundQuest": "Našiel si zvitok s popisom výpravy: \"<%= questText %>\"!" -} \ No newline at end of file +} diff --git a/locales/sv/messages.json b/locales/sv/messages.json index 7af4d934fa..89e96abe86 100644 --- a/locales/sv/messages.json +++ b/locales/sv/messages.json @@ -10,6 +10,7 @@ "messageLikesFood": "<%= egg %> gillar verkligen <%= foodText %>!", "messageDontEnjoyFood": "<%= egg %> eats the <%= foodText %> but doesn't seem to enjoy it.", "messageBought": "Bought <%= itemText %>", + "messageEquipped": " <%= itemText %> equipped.", "messageUnEquipped": "<%= itemText %> un-equipped.", "messageMissingEggPotion": "You're missing either that egg or that potion", "messageAlreadyPet": "You already have that pet. Try hatching a different combination!", @@ -20,4 +21,4 @@ "messageDropEgg": "You've found a <%= dropText %> Egg! <%= dropNotes %>", "messageDropPotion": "You've found a <%= dropText %> Hatching Potion! <%= dropNotes %>", "messageFoundQuest": "You've found the quest \"<%= questText %>\"!" -} \ No newline at end of file +} diff --git a/locales/uk/messages.json b/locales/uk/messages.json index 4f1762e2b0..05a4b6c0f1 100644 --- a/locales/uk/messages.json +++ b/locales/uk/messages.json @@ -10,6 +10,7 @@ "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.", "messageMissingEggPotion": "You're missing either that egg or that potion", "messageAlreadyPet": "You already have that pet. Try hatching a different combination!", @@ -20,4 +21,4 @@ "messageDropEgg": "You've found a <%= dropText %> Egg! <%= dropNotes %>", "messageDropPotion": "You've found a <%= dropText %> Hatching Potion! <%= dropNotes %>", "messageFoundQuest": "You've found the quest \"<%= questText %>\"!" -} \ No newline at end of file +} diff --git a/script/index.coffee b/script/index.coffee index c915168e71..1235d8e4f8 100644 --- a/script/index.coffee +++ b/script/index.coffee @@ -649,7 +649,7 @@ api.wrap = (user, main=true) -> item = content.gear.flat[key] if user.items.gear[type][item.type] is key 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 user.items.gear[type][item.type] = item.key message = user.fns.handleTwoHanded(item,type,req)