Merge pull request #3823 from Imperadeiro98/master

Fix #2844
This commit is contained in:
Scott Erickson 2016-08-10 09:46:20 -07:00 committed by GitHub
commit 9b992a8679
4 changed files with 6 additions and 5 deletions

View file

@ -476,6 +476,7 @@
victory_experience_gained: "XP Gained"
victory_gems_gained: "Gems Gained"
victory_new_item: "New Item"
victory_new_hero: "New Hero"
victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
victory_become_a_viking: "Become a Viking"
victory_no_progress_for_teachers: "Progress is not saved for teachers. But, you can add a student account to your classroom for yourself."

View file

@ -22,12 +22,9 @@ block content
#article-treema
#article-view
h3(data-i18n="resources.patches") Patches
.patches-view
hr
div#error-view

View file

@ -79,7 +79,10 @@ block modal-body-content
.reward-panel.hero(data-hero-thang-type=hero.get('original'))
.reward-image-container(class=animate ? 'pending-reward-image' : 'show')
img(src=hero.getPortraitURL())
.reward-text= animate ? 'New Hero' : hero.get('name')
if animate
.reward-text(data-i18n="play_level.victory_new_hero") New Hero
else
.reward-text= i18n(hero.attributes, 'name')
if rewards.items
for item in rewards.items

View file

@ -324,7 +324,7 @@ module.exports = class HeroVictoryModal extends ModalView
@playSound 'item-unlocked' if 0.5 < ratio < 0.6
else if panel.hero
thangType = @thangTypes[panel.hero]
panel.textEl.text(thangType.get('name'))
panel.textEl.text utils.i18n(thangType.attributes, 'name')
@playSelectionSound thangType if 0.5 < ratio < 0.6
if ratio is 1
panel.rootEl.removeClass('animating').find('.reward-image-container img').removeClass('pulse')