Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Passed language param to text functions (#8220)

Browse Source
This commit is contained in:
Keith Holliday
2016-11-17 12:32:07 -06:00
committed by Matteo Pagliazzi
parent 8c4f35daf4
commit 3ea7b72024
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
website/views/options/inventory/mounts.jade
+2 -2
View File
@@ -7,7 +7,7 @@ mixin mountList(eggSource, potionSource)
each potion in potionSource
- var mountKey = egg.key+"-"+potion.key
- var mount = env.Content.mountInfo[mountKey]
div(popover-trigger='mouseenter', popover=mount.text(), popover-placement='bottom')
div(popover-trigger='mouseenter', popover=mount.text(env.language.code), popover-placement='bottom')
button(class="pet-button Mount_Icon_#{mountKey}", ng-show='user.items.mounts["#{mountKey}"]', ng-class='{active: user.items.currentMount == "#{mountKey}"}', ng-click='chooseMount("#{egg.key}", "#{potion.key}")')
button(class="pet-button mount-not-owned", ng-if='!user.items.mounts["#{mountKey}"] && (#{potion.canBuy()} || user.items.hatchingPotions["#{potion.key}"] || user.items.pets["#{mountKey}"])')
.PixelPaw
@@ -35,7 +35,7 @@ mixin mountList(eggSource, potionSource)
each egg in env.Content.dropEggs
- var mountKey = egg.key + "-" + potion.key
- var mount = env.Content.mountInfo[mountKey]
div(popover-trigger='mouseenter', popover=mount.text(), popover-placement='bottom')
div(popover-trigger='mouseenter', popover=mount.text(env.language.code), popover-placement='bottom')
button(class="pet-button Mount_Icon_#{mountKey}", ng-show='user.items.mounts["#{mountKey}"]', ng-class='{active: user.items.currentMount == "#{mountKey}"}', ng-click='chooseMount("#{egg.key}", "#{potion.key}")')
button(class="pet-button mount-not-owned", ng-if='!user.items.mounts["#{mountKey}"] && (#{potion.canBuy()} || user.items.hatchingPotions["#{potion.key}"] || user.items.pets["#{mountKey}"])')
.PixelPaw
website/views/options/inventory/pets.jade
+2 -2
View File
@@ -6,7 +6,7 @@ mixin petList(eggSource, potionSource)
each potion in potionSource
- var petKey = egg.key+"-"+potion.key
- var pet = env.Content.petInfo[petKey]
div(popover-trigger='mouseenter', popover=pet.text(), popover-placement='bottom')
div(popover-trigger='mouseenter', popover=pet.text(env.language.code), popover-placement='bottom')
button(class="pet-button Pet-#{petKey}", ng-if='user.items.pets["#{petKey}"]>0', ng-class='{active: user.items.currentPet == "#{petKey}", selectableInventory: #{!egg.noMount} && selectedFood && !user.items.mounts["#{petKey}"]}', ng-click='choosePet("#{egg.key}", "#{potion.key}")')
.progress(ng-show='!user.items.mounts["#{petKey}"]')
.progress-bar.progress-bar-success(ng-style='{width: user.items.pets["#{petKey}"]/.5 + "%"}')
@@ -35,7 +35,7 @@ mixin petList(eggSource, potionSource)
each egg in env.Content.dropEggs
- var petKey = egg.key+"-"+potion.key
- var pet = env.Content.petInfo[petKey]
div(popover-trigger='mouseenter', popover=pet.text(), popover-placement='bottom')
div(popover-trigger='mouseenter', popover=pet.text(env.language.code), popover-placement='bottom')
button(class="pet-button Pet-#{petKey}", ng-if='user.items.pets["#{petKey}"]>0', ng-class='{active: user.items.currentPet == "#{petKey}", selectableInventory: #{!egg.noMount} && selectedFood && !user.items.mounts["#{petKey}"]}', ng-click='choosePet("#{egg.key}", "#{potion.key}")')
.progress(ng-show='!user.items.mounts["#{petKey}"]')
.progress-bar.progress-bar-success(ng-style='{width: user.items.pets["#{petKey}"]/.5 + "%"}')