From fa212b6e935945a9dac3d421ca5bea01ecd19fa3 Mon Sep 17 00:00:00 2001 From: Luveluen Date: Mon, 20 Jan 2014 17:50:28 +0100 Subject: [PATCH 1/7] Update index.jade --- views/options/inventory/index.jade | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/views/options/inventory/index.jade b/views/options/inventory/index.jade index f57e406c85..1671d70eac 100644 --- a/views/options/inventory/index.jade +++ b/views/options/inventory/index.jade @@ -5,17 +5,17 @@ script(type='text/ng-template', id='partials/options.inventory.html') ul.nav.nav-tabs li(ng-class="{ active: $state.includes('options.inventory.drops') }") a(ui-sref='options.inventory.drops') - | Market + =env.t('market') li(ng-class="{ active: $state.includes('options.inventory.pets') }") a(ui-sref='options.inventory.pets') - | Pets + =env.t('pets') li(ng-class="{ active: $state.includes('options.inventory.mounts') }") a(ui-sref='options.inventory.mounts') - | Mounts + =env.t('mounts') li.equipment-tab(ng-class="{ active: $state.includes('options.inventory.equipment') }") a(ui-sref='options.inventory.equipment') - | Equipment + =env.t('equipment') .tab-content .tab-pane.active - div(ui-view) \ No newline at end of file + div(ui-view) From 06132f8a48479589a36a62965d4e9abe39cf582f Mon Sep 17 00:00:00 2001 From: Luveluen Date: Mon, 20 Jan 2014 18:55:29 +0100 Subject: [PATCH 2/7] Update inventory.jade --- views/options/inventory/inventory.jade | 63 +++++++++++++------------- 1 file changed, 31 insertions(+), 32 deletions(-) diff --git a/views/options/inventory/inventory.jade b/views/options/inventory/inventory.jade index b864cde8cc..36c027bce3 100644 --- a/views/options/inventory/inventory.jade +++ b/views/options/inventory/inventory.jade @@ -1,19 +1,19 @@ script(type='text/ng-template', id='partials/options.inventory.equipment.html') .row-fluid .span6.border-right - h3 Battle Gear - small This is the gear you wear into battle, it affects numbers when interacting with your tasks. + h3=env.t('battleGear') + small =env.t('battleGearText') li.customize-menu.inventory-gear menu.pets-menu(label='{{label}}', ng-repeat='(klass,label) in {base:"Base", warrior:"Warrior", wizard:"Wizard", rogue:"Rogue", healer:"Healer", special:"Special"}', ng-show='gear[klass]') div(ng-repeat='item in gear[klass]') button.customize-option(popover='{{item.notes}}', popover-title='{{item.text}}', popover-trigger='mouseenter', popover-placement='right', ng-click='user.ops.equip({params:{key:item.key}})', class='shop_{{item.key}}', ng-class='{selectableInventory: user.items.gear.equipped[item.type] == item.key}') .span6 - h3 Costume - small But if you prefer the look of other gear to what you have equipped, check this box to visually don a costume while wearing your battle gear underneath. + h3=env.t('costume') + small =env.t('costumeText') br label.checkbox.inline input(type="checkbox", ng-model="user.preferences.costume", ng-click='set({"preferences.costume":!user.preferences.costume})') - | Use Costume  + =env.t('useCostume') li.customize-menu(ng-if='user.preferences.costume') menu.pets-menu(label='{{label}}', ng-repeat='(klass,label) in {base:"Base", warrior:"Warrior", wizard:"Wizard", rogue:"Rogue", healer:"Healer", special:"Special"}', ng-show='gear[klass]') div(ng-repeat='item in gear[klass]') @@ -22,13 +22,13 @@ script(type='text/ng-template', id='partials/options.inventory.equipment.html') script(type='text/ng-template', id='partials/options.inventory.drops.html') .row-fluid .span6.border-right - h2 Inventory - p.well Click an egg to see usable potions highlighted in green and then click one of the highlighted potions to hatch your pet. If no potions are highlighted, click that egg again to deselect it, and instead click a potion first to have the usable eggs highlighted. You can also sell unwanted drops to Alexander the Merchant. + h2=env.t('inventory') + p.well =env.t('inventoryText') menu.inventory-list(type='list') li.customize-menu - menu.pets-menu(label='Eggs ({{eggCount}})') - p.muted(ng-show='eggCount < 1') You don't have any eggs. + menu.pets-menu(label=env.t('eggs') + '({{eggCount}})') + p.muted(ng-show='eggCount < 1')=env.t('noEggs') div(ng-repeat='(egg,points) in ownedItems(user.items.eggs)') //TODO move positioning this styling to css button.customize-option(popover='{{Content.eggs[egg].notes}}', popover-title='{{Content.eggs[egg].text}} Egg', popover-trigger='mouseenter', popover-placement='right', ng-click='chooseEgg(egg)', class='Pet_Egg_{{egg}}', ng-class='{selectableInventory: selectedPotion && !user.items.pets[egg+"-"+selectedPotion.key]}') @@ -36,35 +36,35 @@ script(type='text/ng-template', id='partials/options.inventory.drops.html') //-p {{Content.eggs[egg].text}} li.customize-menu - menu.hatchingPotion-menu(label='Hatching Potions ({{potCount}})') - p.muted(ng-show='potCount < 1') You don't have any hatching potions. + menu.hatchingPotion-menu(label=env.t('hatchingPotions') + '({{potCount}})') + p.muted(ng-show='potCount < 1')=env.t('noHatchingPotions') div(ng-repeat='(pot,points) in ownedItems(user.items.hatchingPotions)') button.customize-option(popover='{{Content.hatchingPotions[pot].notes}}', popover-title='{{Content.hatchingPotions[pot].text}} Potion', popover-trigger='mouseenter', popover-placement='right', ng-click='choosePotion(pot)', class='Pet_HatchingPotion_{{pot}}', ng-class='{selectableInventory: selectedEgg && !user.items.pets[selectedEgg.key+"-"+pot]}') .badge.badge-info.stack-count {{points}} li.customize-menu - menu.pets-menu(label='Quest Scrolls ({{questCount}})') - p.muted(ng-show='questCount < 1') You don't have any quest scrolls. - p.muted Quests require parties. If you want to quest solo, create an empty party + menu.pets-menu(label=env.t('scrolls') + '({{questCount}})') + p.muted(ng-show='questCount < 1')=env.t('noScrolls'). + p.muted!=env.t('scrollsText1') + '' + !=env.t('scrollsText2') + '' div(ng-repeat='(quest_key,points) in ownedItems(user.items.quests)', ng-init='quest = Content.quests[quest_key]') button.customize-option(popover='{{quest.previous && !user.achievements.quests[quest.previous] ? "You need to complete the previous quest to start this one!" : quest.notes}}', popover-title='{{quest.text}}', popover-trigger='mouseenter', popover-placement='right', ng-click='showQuest(quest_key)', class='inventory_quest_scroll', ng-class='{locked: quest.previous && !user.achievements.quests[quest.previous]}') .badge.badge-info.stack-count {{points}} li.customize-menu - menu.pets-menu(label='Food ({{foodCount}})') - p(ng-show='foodCount < 1') You don't have any food. + menu.pets-menu(label=env.t('food') + '({{foodCount}})') + p(ng-show='foodCount < 1')=env.t('noFood') div(ng-repeat='(food,points) in ownedItems(user.items.food)') button.customize-option(popover='{{Content.food[food].notes}}', popover-title='{{Content.food[food].text}}', popover-trigger='mouseenter', popover-placement='right', ng-click='chooseFood(food)', class='Pet_Food_{{food}}') .badge.badge-info.stack-count {{points}} li.customize-menu(ng-if='user.items.special.snowball') - menu.pets-menu(label='Special') + menu.pets-menu(label=env.t('special')) div button.customize-option(popover='{{Content.special.snowball.notes}}', popover-title='{{Content.special.snowball.text}}', popover-trigger='mouseenter', popover-placement='right', ng-click='castStart(Content.special.snowball)', class='inventory_special_snowball') .badge.badge-info.stack-count {{user.items.special.snowball}} .span6 - h2 Market + h2=env.t('market') .row-fluid table.npc_alex_container tr @@ -74,21 +74,20 @@ script(type='text/ng-template', id='partials/options.inventory.drops.html') .popover.static-popover.fade.right.in .arrow h3.popover-title - a(target='_blank', href='http://www.kickstarter.com/profile/523661924') Alexander the Merchant + a(target='_blank', href='http://www.kickstarter.com/profile/523661924')=env.t('alexander') .popover-content p - | Welcome to the Market! Buy hard-to-find eggs and potions! Sell your extras! Commission useful services! Come see what we have to offer. + =env.t('welcomeMarket') p button.btn.btn-primary(ng-show='selectedEgg', ng-click='sellInventory()') - | Sell {{selectedEgg.key}} for {{selectedEgg.value}} Gold + =env.t('sellEgg', {{selectedEgg.key}}, {{selectedEgg.value}}) button.btn.btn-primary(ng-show='selectedPotion', ng-click='sellInventory()') - | Sell {{selectedPotion.key}} for {{selectedPotion.value}} Gold + =env.t('sellPotion', {{selectedPotion.key}}, {{selectedPotion.value}}) button.btn.btn-primary(ng-show='selectedFood', ng-click='sellInventory()') - | Sell {{selectedFood.key}} for {{selectedFood.value}} Gold - + =env.t('sellFood', {{selectedFood.key}}, {{selectedFood.value}}) menu.inventory-list(type='list') li.customize-menu - menu.pets-menu(label='Eggs') + menu.pets-menu(label=env.t('eggs')) div(ng-repeat='egg in Content.eggs') button.customize-option(popover='{{egg.notes}}', popover-title='{{egg.text}} Egg', popover-trigger='mouseenter', popover-placement='left', ng-click='purchase("eggs", egg)', class='Pet_Egg_{{egg.key}}') p @@ -96,7 +95,7 @@ script(type='text/ng-template', id='partials/options.inventory.drops.html') span.Pet_Currency_Gem1x.inline-gems li.customize-menu - menu.pets-menu(label='Hatching Potions') + menu.pets-menu(label=env.t('hatchingPotions')) div(ng-repeat='pot in Content.hatchingPotions') button.customize-option(popover='{{pot.notes}}', popover-title='{{pot.text}} Potion', popover-trigger='mouseenter', popover-placement='left', ng-click='purchase("hatchingPotions", pot)', class='Pet_HatchingPotion_{{pot.key}}') p @@ -104,7 +103,7 @@ script(type='text/ng-template', id='partials/options.inventory.drops.html') span.Pet_Currency_Gem1x.inline-gems li.customize-menu - menu.pets-menu(label='Food') + menu.pets-menu(label=env.t('food')) div(ng-repeat='food in Content.food', ng-show='food.key !== "Saddle"') button.customize-option(popover='{{food.notes}}', popover-title='{{food.text}}', popover-trigger='mouseenter', popover-placement='left', ng-click='purchase("food", food)', class='Pet_Food_{{food.key}}') p @@ -112,8 +111,8 @@ script(type='text/ng-template', id='partials/options.inventory.drops.html') span.Pet_Currency_Gem1x.inline-gems li.customize-menu - menu.pets-menu(label='Quests') - p.muted Quests require parties. If you want to quest solo, create an empty party + menu.pets-menu(label=env.t('quests')) + p.muted!=env.t('scrollsText1') + '' + !=env.t('scrollsText2') + '' div(ng-repeat='quest in Content.quests') button.customize-option(popover='{{quest.text}}', popover-trigger='mouseenter', popover-placement='left', ng-click='purchase("quests", quest)', class='inventory_quest_scroll', ng-class='{locked: quest.previous && !user.achievements.quests[quest.previous]}') p @@ -121,14 +120,14 @@ script(type='text/ng-template', id='partials/options.inventory.drops.html') span.Pet_Currency_Gem1x.inline-gems li.customize-menu - menu.pets-menu(label='Special') + menu.pets-menu(label=env.t('special')) div button.customize-option(popover='{{Content.food.Saddle.notes}}', popover-title='{{Content.food.Saddle.text}}', popover-trigger='mouseenter', popover-placement='left', ng-click='purchase("food", Content.food.Saddle)', class='Pet_Food_{{Content.food.Saddle.key}}') p | {{Content.food.Saddle.value}} span.Pet_Currency_Gem1x.inline-gems div - button.customize-option(popover='Return all tasks to neutral value (yellow color), and restore all lost Health.', popover-title=env.t('rerollName'), popover-trigger='mouseenter', popover-placement='left', ng-click='modals.reroll = true', class='inventory_special_fortify') + button.customize-option(popover=env.t('fortifyPop'), popover-title=env.t('rerollName'), popover-trigger='mouseenter', popover-placement='left', ng-click='modals.reroll = true', class='inventory_special_fortify') p | 4 span.Pet_Currency_Gem1x.inline-gems @@ -138,7 +137,7 @@ script(type='text/ng-template', id='partials/options.inventory.drops.html') | {{Content.spells.special.snowball.value}} span.Pet_Currency_Gem1x.inline-gems div(ng-show='user.flags.rebirthEnabled') - button.customize-option(popover='Begin a new character at Level 1 while retaining achievements, collectibles, and tasks with history.', popover-title='Orb of Rebirth', popover-trigger='mouseenter', popover-placement='left', ng-click='modals.rebirth = true', class='rebirth_orb') + button.customize-option(popover=env.t('rebirthPop'), popover-title=env.t('rebirthName'), popover-trigger='mouseenter', popover-placement='left', ng-click='modals.rebirth = true', class='rebirth_orb') p | 8 span.Pet_Currency_Gem1x.inline-gems From 18eeafafc870c411b34f0a27a30744a3ad47fff9 Mon Sep 17 00:00:00 2001 From: Luveluen Date: Mon, 20 Jan 2014 19:07:50 +0100 Subject: [PATCH 3/7] Update inventory.jade --- views/options/inventory/inventory.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/options/inventory/inventory.jade b/views/options/inventory/inventory.jade index 36c027bce3..33400b5a66 100644 --- a/views/options/inventory/inventory.jade +++ b/views/options/inventory/inventory.jade @@ -47,7 +47,7 @@ script(type='text/ng-template', id='partials/options.inventory.drops.html') p.muted(ng-show='questCount < 1')=env.t('noScrolls'). p.muted!=env.t('scrollsText1') + '' + !=env.t('scrollsText2') + '' div(ng-repeat='(quest_key,points) in ownedItems(user.items.quests)', ng-init='quest = Content.quests[quest_key]') - button.customize-option(popover='{{quest.previous && !user.achievements.quests[quest.previous] ? "You need to complete the previous quest to start this one!" : quest.notes}}', popover-title='{{quest.text}}', popover-trigger='mouseenter', popover-placement='right', ng-click='showQuest(quest_key)', class='inventory_quest_scroll', ng-class='{locked: quest.previous && !user.achievements.quests[quest.previous]}') + button.customize-option(popover='{{quest.previous && !user.achievements.quests[quest.previous] ? =env.t('scrolls') : quest.notes}}', popover-title='{{quest.text}}', popover-trigger='mouseenter', popover-placement='right', ng-click='showQuest(quest_key)', class='inventory_quest_scroll', ng-class='{locked: quest.previous && !user.achievements.quests[quest.previous]}') .badge.badge-info.stack-count {{points}} li.customize-menu From c85e3a210703fd80b85e7ca8f902c2147d5a720c Mon Sep 17 00:00:00 2001 From: Luveluen Date: Mon, 20 Jan 2014 19:23:49 +0100 Subject: [PATCH 4/7] Update inventory.jade --- views/options/inventory/inventory.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/options/inventory/inventory.jade b/views/options/inventory/inventory.jade index 33400b5a66..576741ca8a 100644 --- a/views/options/inventory/inventory.jade +++ b/views/options/inventory/inventory.jade @@ -47,7 +47,7 @@ script(type='text/ng-template', id='partials/options.inventory.drops.html') p.muted(ng-show='questCount < 1')=env.t('noScrolls'). p.muted!=env.t('scrollsText1') + '' + !=env.t('scrollsText2') + '' div(ng-repeat='(quest_key,points) in ownedItems(user.items.quests)', ng-init='quest = Content.quests[quest_key]') - button.customize-option(popover='{{quest.previous && !user.achievements.quests[quest.previous] ? =env.t('scrolls') : quest.notes}}', popover-title='{{quest.text}}', popover-trigger='mouseenter', popover-placement='right', ng-click='showQuest(quest_key)', class='inventory_quest_scroll', ng-class='{locked: quest.previous && !user.achievements.quests[quest.previous]}') + button.customize-option(popover='{{quest.previous && !user.achievements.quests[quest.previous] ? =env.t('scrollsPre') : quest.notes}}', popover-title='{{quest.text}}', popover-trigger='mouseenter', popover-placement='right', ng-click='showQuest(quest_key)', class='inventory_quest_scroll', ng-class='{locked: quest.previous && !user.achievements.quests[quest.previous]}') .badge.badge-info.stack-count {{points}} li.customize-menu From e47afa89654076047561f608c248b14b003592c6 Mon Sep 17 00:00:00 2001 From: Luveluen Date: Mon, 20 Jan 2014 19:41:17 +0100 Subject: [PATCH 5/7] Update stable.jade --- views/options/inventory/stable.jade | 32 ++++++++++++++--------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/views/options/inventory/stable.jade b/views/options/inventory/stable.jade index 4da7d4830f..4043ae0046 100644 --- a/views/options/inventory/stable.jade +++ b/views/options/inventory/stable.jade @@ -8,11 +8,11 @@ script(type='text/ng-template', id='partials/options.inventory.mounts.html') .popover.static-popover.fade.right.in(style='max-width: 550px; margin-left: 10px;') .arrow h3.popover-title - a(target='_blank', href='http://www.kickstarter.com/profile/mattboch') Matt Boch + a(target='_blank', href='http://www.kickstarter.com/profile/mattboch')=env.t('mattBoch') .popover-content p. - Shall I bring you your steed, {{user.profile.name}}? Click a mount to saddle up. - h4 {{mountCount}} / {{totalPets}} Mounts Tamed + =env.t('mattShall1') + '{{user.profile.name}}' + =env.t('mattShall2') + h4 {{mountCount}} / {{totalPets}} =env.t('mountsTamed') menu.pets(type='list') li.customize-menu(ng-repeat='egg in Content.eggs') menu @@ -22,12 +22,12 @@ script(type='text/ng-template', id='partials/options.inventory.mounts.html') button(class="pet-button pet-not-owned", ng-hide='user.items.mounts[mount]') .PixelPaw - h4 Rare Mounts + h4=env.t('rareMounts') menu div - button(ng-if='user.items.mounts["BearCub-Polar"]', class="pet-button Mount_Head_BearCub-Polar", ng-class='{active: user.items.currentMount == "BearCub-Polar"}', ng-click='chooseMount("BearCub", "Polar")', popover='Polar Bear', popover-trigger='mouseenter', popover-placement='bottom') + button(ng-if='user.items.mounts["BearCub-Polar"]', class="pet-button Mount_Head_BearCub-Polar", ng-class='{active: user.items.currentMount == "BearCub-Polar"}', ng-click='chooseMount("BearCub", "Polar")', popover=env.t('polarBear'), popover-trigger='mouseenter', popover-placement='bottom') //.Mount_Head_BearCub-Polar - button(ng-if='user.items.mounts["LionCub-Ethereal"]', class="pet-button Mount_Head_LionCub-Ethereal", ng-class='{active: user.items.currentMount == "LionCub-Ethereal"}', ng-click='chooseMount("LionCub", "Ethereal")', popover='Ethereal Lion', popover-trigger='mouseenter', popover-placement='bottom') + button(ng-if='user.items.mounts["LionCub-Ethereal"]', class="pet-button Mount_Head_LionCub-Ethereal", ng-class='{active: user.items.currentMount == "LionCub-Ethereal"}', ng-click='chooseMount("LionCub", "Ethereal")', popover=env.t('etherealLion'), popover-trigger='mouseenter', popover-placement='bottom') //.Mount_Head_LionCub-Ethereal script(type='text/ng-template', id='partials/options.inventory.pets.html') @@ -40,11 +40,11 @@ script(type='text/ng-template', id='partials/options.inventory.pets.html') .popover.static-popover.fade.right.in(style='max-width: 550px; margin-left: 10px;') .arrow h3.popover-title - a(target='_blank', href='http://www.kickstarter.com/profile/mattboch') Matt Boch + a(target='_blank', href='http://www.kickstarter.com/profile/mattboch') =env.t('mattBoch') .popover-content p. - Welcome to the Stable! I'm Matt, the beast master. Choose a pet here to venture at your side. Feed them and they'll grow into powerful steeds. Have a look-see at all the pets you can collect. - h4 {{petCount}} / {{totalPets}} Pets Found + =env.t('mattBochText1') + '' + =env.t('mattBochText2') + '' + =env.t('mattBochText3') + h4 {{petCount}} / {{totalPets}} =env.t('petsFound') menu.pets(type='list') li.customize-menu(ng-repeat='egg in Content.eggs') @@ -56,16 +56,16 @@ script(type='text/ng-template', id='partials/options.inventory.pets.html') button(class="pet-button pet-not-owned", ng-if='!user.items.pets[pet]') .PixelPaw - h4 Rare Pets + h4 =env.t('rarePets') menu div - button(ng-if='user.items.pets["Wolf-Veteran"]', class="pet-button Pet-Wolf-Veteran", ng-class='{active: user.items.currentPet == "Wolf-Veteran"}', ng-click='choosePet("Wolf", "Veteran")', popover='Veteran Wolf', popover-trigger='mouseenter', popover-placement='bottom') - button(ng-if='user.items.pets["Wolf-Cerberus"]', class="pet-button Pet-Wolf-Cerberus", ng-class='{active: user.items.currentPet == "Wolf-Cerberus"}', ng-click='choosePet("Wolf", "Cerberus")', popover='Cerberus Pup', popover-trigger='mouseenter', popover-placement='bottom') - button(ng-if='user.items.pets["Turkey-Base"]', class="pet-button Pet-Turkey-Base", ng-class='{active: user.items.currentPet == "Turkey-Base"}', ng-click='choosePet("Turkey", "Base")', popover='Turkey', popover-trigger='mouseenter', popover-placement='bottom') - button(ng-if='user.items.pets["BearCub-Polar"]', class="pet-button Pet-BearCub-Polar", ng-class='{active: user.items.currentPet == "BearCub-Polar"}', ng-click='choosePet("BearCub", "Polar")', popover='Polar Bear Cub', popover-trigger='mouseenter', popover-placement='bottom') - button(ng-if='user.items.pets["Dragon-Hydra"]', class="pet-button Pet-Dragon-Hydra", ng-class='{active: user.items.currentPet == "Dragon-Hydra"}', ng-click='choosePet("Dragon", "Hydra")', popover='Hydra', popover-trigger='mouseenter', popover-placement='bottom') + button(ng-if='user.items.pets["Wolf-Veteran"]', class="pet-button Pet-Wolf-Veteran", ng-class='{active: user.items.currentPet == "Wolf-Veteran"}', ng-click='choosePet("Wolf", "Veteran")', popover=env.t('veteranWolf'), popover-trigger='mouseenter', popover-placement='bottom') + button(ng-if='user.items.pets["Wolf-Cerberus"]', class="pet-button Pet-Wolf-Cerberus", ng-class='{active: user.items.currentPet == "Wolf-Cerberus"}', ng-click='choosePet("Wolf", "Cerberus")', popover=env.t('cerberusPup'), popover-trigger='mouseenter', popover-placement='bottom') + button(ng-if='user.items.pets["Turkey-Base"]', class="pet-button Pet-Turkey-Base", ng-class='{active: user.items.currentPet == "Turkey-Base"}', ng-click='choosePet("Turkey", "Base")', popover=env.t('turkey'), popover-trigger='mouseenter', popover-placement='bottom') + button(ng-if='user.items.pets["BearCub-Polar"]', class="pet-button Pet-BearCub-Polar", ng-class='{active: user.items.currentPet == "BearCub-Polar"}', ng-click='choosePet("BearCub", "Polar")', popover=env.t('polarBearPup'), popover-trigger='mouseenter', popover-placement='bottom') + button(ng-if='user.items.pets["Dragon-Hydra"]', class="pet-button Pet-Dragon-Hydra", ng-class='{active: user.items.currentPet == "Dragon-Hydra"}', ng-click='choosePet("Dragon", "Hydra")', popover=env.t('hydra'), popover-trigger='mouseenter', popover-placement='bottom') a(target='_blank', href='http://habitrpg.wikia.com/wiki/Contributing_to_HabitRPG') - button(ng-if='!user.items.pets["Dragon-Hydra"]', class="pet-button pet-not-owned", popover-trigger='mouseenter', popover-placement='right', popover="Click the gold paw to learn more about how you can obtain this rare pet through contributing to HabitRPG!", popover-title='How to Get this Pet!') + button(ng-if='!user.items.pets["Dragon-Hydra"]', class="pet-button pet-not-owned", popover-trigger='mouseenter', popover-placement='right', popover=env.t('rarePetPop1'), popover-title=env.t('rarepetPop2')) .PixelPaw-Gold .well.food-tray From 8b97438607cea3ed583ec96768d524c9fd1601fc Mon Sep 17 00:00:00 2001 From: Luveluen Date: Mon, 20 Jan 2014 19:44:33 +0100 Subject: [PATCH 6/7] Update stable.jade --- views/options/inventory/stable.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/options/inventory/stable.jade b/views/options/inventory/stable.jade index 4043ae0046..eb5e763dfb 100644 --- a/views/options/inventory/stable.jade +++ b/views/options/inventory/stable.jade @@ -69,10 +69,10 @@ script(type='text/ng-template', id='partials/options.inventory.pets.html') .PixelPaw-Gold .well.food-tray - p(ng-show='foodCount < 1') You don't have any food. + p(ng-show='foodCount < 1')=env.t('noFood') menu.inventory-list(type='list', ng-if='foodCount > 0') li.customize-menu - menu.pets-menu(label='Food') + menu.pets-menu(label=env.t('food')) div(ng-repeat='(food,points) in ownedItems(user.items.food)') button.customize-option(popover-append-to-body='true', popover='{{Content.food[food].notes}}', popover-title='{{Content.food[food].text}}', popover-trigger='mouseenter', popover-placement='left', ng-click='chooseFood(food)', class='Pet_Food_{{food}}') .badge.badge-info.stack-count {{points}} From 4f07ab39b0868764c665bbf914474745e11ecc32 Mon Sep 17 00:00:00 2001 From: Luveluen Date: Wed, 22 Jan 2014 12:10:51 +0100 Subject: [PATCH 7/7] Update inventory.jade --- views/options/inventory/inventory.jade | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/views/options/inventory/inventory.jade b/views/options/inventory/inventory.jade index 576741ca8a..c1251db2a4 100644 --- a/views/options/inventory/inventory.jade +++ b/views/options/inventory/inventory.jade @@ -80,11 +80,23 @@ script(type='text/ng-template', id='partials/options.inventory.drops.html') =env.t('welcomeMarket') p button.btn.btn-primary(ng-show='selectedEgg', ng-click='sellInventory()') - =env.t('sellEgg', {{selectedEgg.key}}, {{selectedEgg.value}}) + =env.t('sell') + | {{selectedEgg.key}} + =env.t('for') + | {{selectedEgg.value}}) + =env.t('gold') button.btn.btn-primary(ng-show='selectedPotion', ng-click='sellInventory()') - =env.t('sellPotion', {{selectedPotion.key}}, {{selectedPotion.value}}) + =env.t('sell') + | {{selectedPotion.key}} + =env.t('for') + | {{selectedPotion.value}}) + =env.t('gold') button.btn.btn-primary(ng-show='selectedFood', ng-click='sellInventory()') - =env.t('sellFood', {{selectedFood.key}}, {{selectedFood.value}}) + =env.t('sell') + | {{selectedFood.key}} + =env.t('for') + | {{selectedFood.value}}) + =env.t('gold') menu.inventory-list(type='list') li.customize-menu menu.pets-menu(label=env.t('eggs'))