krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 07:07:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Stable minor fixes (#8861)

Browse Source 
* fix dialog text + close after hatching

* Update newClient.json
This commit is contained in:
negue
2017-07-18 01:04:34 +02:00
committed by Matteo Pagliazzi
parent 0da1144635
commit ea3ed26f42
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
website/client/components/inventory/stable/index.vue
View File

@@ -223,7 +223,7 @@
div(:class="'Pet_Egg_'+hatchablePet.eggKey") div(:class="'Pet_Egg_'+hatchablePet.eggKey")
h4.title {{ hatchablePet.name }} h4.title {{ hatchablePet.name }}
div.text(v-html="$t('haveHatchablePet', { potion: hatchablePet.potionName, egg: hatchablePet.eggName })") div.text(v-html="$t('hatchDialogText', { potionName: hatchablePet.potionName, eggName: hatchablePet.eggName, petName: hatchablePet.name })")
span.svg-icon.icon-10(v-html="icons.close", slot="modal-header", @click="closeHatchPetDialog()") span.svg-icon.icon-10(v-html="icons.close", slot="modal-header", @click="closeHatchPetDialog()")
@@ -866,6 +866,7 @@
hatchPet (pet) { hatchPet (pet) {
this.$store.dispatch('common:hatch', {egg: pet.eggKey, hatchingPotion: pet.potionKey}); this.$store.dispatch('common:hatch', {egg: pet.eggKey, hatchingPotion: pet.potionKey});
this.closeHatchPetDialog();
}, },
onDragStart (ev, food) { onDragStart (ev, food) {
@@ -911,7 +912,6 @@
if (pet.isOwned() || !pet.isHatchable()) { if (pet.isOwned() || !pet.isHatchable()) {
return; return;
} }
// opens the hatch dialog // opens the hatch dialog
this.hatchablePet = pet; this.hatchablePet = pet;
} }

1
website/common/locales/en/newClient.json
View File

@@ -46,6 +46,7 @@
"clickOnPetToFeed": "Click on a Pet to feed <%= foodName %> and watch it grow!", "clickOnPetToFeed": "Click on a Pet to feed <%= foodName %> and watch it grow!",
"dragThisPotion": "Drag this <%= potionName %> to an Egg and hatch a new pet!", "dragThisPotion": "Drag this <%= potionName %> to an Egg and hatch a new pet!",
"clickOnEggToHatch": "Click on an Egg to use your <%= potionName %> and hatch a new pet!", "clickOnEggToHatch": "Click on an Egg to use your <%= potionName %> and hatch a new pet!",
"hatchDialogText": "Pour your <%= potionName %> hatching potion on your <%= eggName %> egg, and it will hatch into a <%= petName %> .",
"editAvatar": "Edit Avatar", "editAvatar": "Edit Avatar",
"sort": "Sort", "sort": "Sort",
"memberCount": "Member Count", "memberCount": "Member Count",