Merge branch 'master' into production

app/locale/sk.coffee

@@ -64,7 +64,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
     achievements: "Úspechy" # Tooltip on achievement list button from /play
     account: "Účet" # Tooltip on account button from /play
     settings: "Nastavenia" # Tooltip on settings button from /play
-#    poll: "Poll" # Tooltip on poll button from /play
+    poll: "Anketa" # Tooltip on poll button from /play
     next: "Ďalší" # Go from choose hero to choose inventory before playing a level
     change_hero: "Zmeniť hrdinu" # Go back from choose inventory to choose hero
     choose_inventory: "Vyzbrojiť sa s predmetmi"
@@ -254,7 +254,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
     victory_sign_up: "Přihlásit se pre uloženie progresu"
     victory_sign_up_poke: "Chceš uložiť svoj kód? Vytvorte si účet zdarma!"
     victory_rate_the_level: "Ohodnoťte túto úroveň: " # Only in old-style levels.
-    victory_return_to_ladder: "Vrátiť sa na Rebríčky"
+    victory_return_to_ladder: "Rebríčky"
     victory_play_continue: "Pokračovať"
     victory_saving_progress: "Stav ukladania"
     victory_go_home: "Návrat Domov" # Only in old-style levels.
@@ -334,7 +334,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
     tip_javascript_java: "Porovnávať Javu a JavaScript je ako porovnávať auto a lietajúci koberec. - Chris Heilmann"
     tip_move_forward: "Ak nevieš lietať, bež, ak nemôžeš bežať, kráčaj, ak nemôžeš kráčať, choď po štyroch, ale nech už robíš čokoľvek, musíš sa hýbať vpred - Martin Luther King Jr."
     tip_google: "Máš problém, ktorý nevieš vyriešiť ? Vygoogluj si ho !"
-    tip_adding_evil: "pridanie špitky zla."
+    tip_adding_evil: "Pridanie špitky zla."
     tip_hate_computers: "Ľudia, ktorí si myslia, že nenávidia počítače, v skutočnosti nenávidia mizerných programátorov. - Larry Niven"
     tip_open_source_contribute: "Aj ty môžeš zlepšiť CodeCombat !"
     tip_recurse: "Iterácia je ľudská, rekurzia božská.. - L. Peter Deutsch"
@@ -484,10 +484,10 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
     backstab: "Pichnutie do chrbta" # As in "this dagger does this much backstab damage"
     skills: "Schopnosti"
     attack_1: "Upravuje na"
-    attack_2: "hodnotu udávanej"
+    attack_2: "hodnotu udávanej újmy zbraňou pre typ"
-    attack_3: "újmy zbraňou."
+    attack_3: "."
     health_1: "Upravuje hodnotu zdravia na"
-    health_2: "hodnoty zaručenej"
+    health_2: "hodnoty zaručenej pre typ"
     health_3: "brnením."
     speed_1: "Pohybuje sa rýchlosťou"
     speed_2: "metrov za sekundu."
@@ -542,32 +542,32 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
     editor_config_behaviors_label: "Chytré správanie"
     editor_config_behaviors_description: "Automaticky doplňuje hranaté a oblé zátvorky a úvodzovky."
 
-#  about:
+  about:
-#    why_codecombat: "Why CodeCombat?"
+    why_codecombat: "Prečo CodeCombat?"
-#    why_paragraph_1: "If you want to learn to program, you don't need lessons. You need to write a lot of code and have a great time doing it."
+    why_paragraph_1: "Ak sa chceš naučiť programovať, nepotrebuješ lekcie. To, čo potrebuješ je možnosť písať veľa kódu a baviť sa pri tom."
-#    why_paragraph_2_prefix: "That's what programming is about. It's gotta be fun. Not fun like"
+    why_paragraph_2_prefix: "O tom je programovanie. Nemá to byť zábava typu"
-#    why_paragraph_2_italic: "yay a badge"
+    why_paragraph_2_italic: "jéj, mám ďalší odznak"
-#    why_paragraph_2_center: "but fun like"
+    why_paragraph_2_center: ",ale nadšenie ako"
-#    why_paragraph_2_italic_caps: "NO MOM I HAVE TO FINISH THE LEVEL!"
+    why_paragraph_2_italic_caps: "HNEĎ MAMI, LEN DOKONČÍM TÚTO ÚROVEŇ !"
-#    why_paragraph_2_suffix: "That's why CodeCombat is a multiplayer game, not a gamified lesson course. We won't stop until you can't stop--but this time, that's a good thing."
+    why_paragraph_2_suffix: "CodeCombat je skutočná hra pre viacej hráčov, od ktorej sa dá ťažko odtrhnúť."
-#    why_paragraph_3: "If you're going to get addicted to some game, get addicted to this one and become one of the wizards of the tech age."
+    why_paragraph_3: "Ak už sa máš byť závislý na nejakej hre, tak nech je to táto, pri ktorej sa staneš čarodejníkom technického veku."
-#    press_title: "Bloggers/Press"
+    press_title: "Blogeri/Tlač"
-#    press_paragraph_1_prefix: "Want to write about us? Feel free to download and use all of the resources included in our"
+    press_paragraph_1_prefix: "Chceš o nás písať ? Môžeš si stiahnúť a použiť všetky zdroje zahrnuté v našom"
-#    press_paragraph_1_link: "press packet"
+    press_paragraph_1_link: "tlačovom balíčku"
-#    press_paragraph_1_suffix: ". All logos and images may be used without contacting us directly."
+    press_paragraph_1_suffix: ". Všetky logá a obrázky môžeš použiť bez toho, aby si nás priamo kontaktoval."
-#    team: "Team"
+    team: "Tím"
-#    george_title: "Cofounder"
+    george_title: "Spoluzakladateľ"
-#    george_blurb: "Businesser"
+    george_blurb: "Podnikateľ"
-#    scott_title: "Cofounder"
+    scott_title: "Spoluzakladateľ"
-#    scott_blurb: "Reasonable One"
+    scott_blurb: "Ten rozumný"
-#    nick_title: "Cofounder"
+    nick_title: "Spoluzakladateľ"
-#    nick_blurb: "Motivation Guru"
+    nick_blurb: "Motivačný Guru"
-#    michael_title: "Programmer"
+    michael_title: "Programátor"
-#    michael_blurb: "Sys Admin"
+    michael_blurb: "Systémový administrátor"
-#    matt_title: "Programmer"
+    matt_title: "Programátor"
-#    matt_blurb: "Bicyclist"
+    matt_blurb: "Bicyklista"
-#    cat_title: "Chief Artisan"
+    cat_title: "Najvyššia remeselníčka"
-#    cat_blurb: "Airbender"
+    cat_blurb: "Ohýbačka vzduchu"
 #    josh_title: "Game Designer"
 #    josh_blurb: "Floor Is Lava"
 #    jose_title: "Music"
@@ -575,40 +575,40 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 #    retrostyle_title: "Illustration"
 #    retrostyle_blurb: "RetroStyle Games"
 
-#  teachers:
+  teachers:
-#    title: "CodeCombat: Info for Teachers"
+    title: "CodeCombat: Informácie pre učiteľov"
-#    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
+    intro_1: "CodeCombat je online hra, ktorá učí programovať. Študenti píšu kód v skutočných programovacích jazykoch."
-#    intro_2: "No experience required!"
+    intro_2: "Nie sú nutné žiadne predchádzajúce skúsenosti !"
-#    free_title: "How much does it cost?"
+    free_title: "Koľko to stojí ?"
 #    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 per month for access to our other 120+ levels on our exclusive China servers."
-#    free_1: "CodeCombat Basic is FREE! There are 70+ free levels which cover every concept."
+    free_1: "CodeCombat Basic is ZDARMA ! K dispozícii je 70+ úrovní pokrývajúcich každý koncept."
-#    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
+    free_2: "Mesačné predplatné poskytuje prístup k videonávodom a k úrovniam na precvičenie navyše."
-#    teacher_subs_title: "Teachers get free subscriptions!"
+    teacher_subs_title: "Pre učiteľov je predplatné zdarma !"
-#    teacher_subs_1: "Please contact"
+    teacher_subs_1: "Napíšte na"
-#    teacher_subs_2: "to set up a free monthly subscription."
+    teacher_subs_2: "pre zriadenie mesačného predplatného zdarma."
-#    sub_includes_title: "What is included in the subscription?"
+    sub_includes_title: "Čo zahrnuje predplatné ?"
-#    sub_includes_1: "In additional to the 70+ basic levels, students with a monthly subscription get access to these additional features:"
+    sub_includes_1: "Študenti s mesačným predplatným získajú ku 70+ základným úrovniam  aj :"
-#    sub_includes_2: "40+ practice levels"
+    sub_includes_2: "40+ tréningových úrovní"
-#    sub_includes_3: "Video tutorials"
+    sub_includes_3: "Video návody"
-#    sub_includes_4: "Premium email support"
+    sub_includes_4: "Prémiovú emailovú podporu"
-#    sub_includes_5: "7 new heroes with unique skills to master"
+    sub_includes_5: "7 nových hrdinov s jedinečnými schopnosťami"
-#    sub_includes_6: "3500 bonus gems every month"
+    sub_includes_6: "3500 bonusových diamantov každý mesiac"
-#    who_for_title: "Who is CodeCombat for?"
+    who_for_title: "Pre koho je určený CodeComabt ?"
-#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
+    who_for_1: "CodeCombat odporúčame pre žiakov od 9 rokov. Nie sú nutné žiadne predchádzajúce skúsenosti s programovaním."
-#    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
+    who_for_2: "CodeCombat sme navrhli tak, aby oslovil chlapcov aj dievčatá."
-#    material_title: "How much material is there?"
+    material_title: "Aký je objem učebnej látky ?"
 #    material_china: "Approximately 22 hours of gameplay spread over 120+ subscriber-only levels so far, with 5 new levels every week."
-#    material_1: "Approximately 8 hours of free content and an additional 14 hours of subscriber content, with 5 new levels every week."
+    material_1: "Asi 8 hodín bezplatného obsahu a ďalších 14 hodín pre predplatiteľov. 5 nových úrovní každý týždeň."
-#    concepts_title: "What concepts are covered?"
+    concepts_title: "Aké pojmy sú pokryté ?"
-#    how_much_title: "How much does a monthly subscription cost?"
+    how_much_title: "Koľko stojí mesačné predplatné ?"
-#    how_much_1: "A"
+    how_much_1: ""
-#    how_much_2: "monthly subscription"
+    how_much_2: "Mesačné predplatné"
-#    how_much_3: "costs $9.99, and can be cancelled anytime."
+    how_much_3: ", ktoré môže byť kedykoľvek zrušené, stojí 9.99$."
-#    how_much_4: "Additionally, we provide discounts for larger groups:"
+    how_much_4: "Zľavy pre väčšie skupiny:"
 #    group_discounts_1: "We also offer group discounts for bulk subscriptions."
-#    sys_requirements_title: "System Requirements"
+    sys_requirements_title: "Systémové požiadavky"
-#    sys_requirements_1: "A modern web browser. Newer versions of Chrome, Firefox, or Safari. Internet Explorer 9 or later."
+    sys_requirements_1: "Moderný webový prehliadač. Nové verzie prehliadačov Chrome, Firefox alebo Safari. Internet Explorer 9 alebo novší."
-#    sys_requirements_2: "CodeCombat is not supported on iPad yet."
+    sys_requirements_2: "CodeCombat nie je zatiaľ podprovaný pre iPad."
 
   versions:
     save_version_title: "Ulož novú verziu"
@@ -896,48 +896,48 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 #    translating_diplomats: "Our Translating Diplomats:"
 #    helpful_ambassadors: "Our Helpful Ambassadors:"
 
-#  ladder:
+  ladder:
-#    please_login: "Please log in first before playing a ladder game."
+    please_login: "Pred hraním rebríčkovej hry sa musíš najskôr prihlásiť."
-#    my_matches: "My Matches"
+    my_matches: "Moje súboje"
-#    simulate: "Simulate"
+    simulate: "Simuluj"
-#    simulation_explanation: "By simulating games you can get your game ranked faster!"
+    simulation_explanation: "Simulovaním sa dostane hra rýchlejšie do rebríčka !!"
-#    simulate_games: "Simulate Games!"
+    simulate_games: "Simuluj hry !"
-#    simulate_all: "RESET AND SIMULATE GAMES"
+    simulate_all: "RESETUJ A SIMULUJ HRY"
-#    games_simulated_by: "Games simulated by you:"
+    games_simulated_by: "Tebou simulované hry:"
-#    games_simulated_for: "Games simulated for you:"
+    games_simulated_for: "Pre teba simulvané hry:"
-#    games_simulated: "Games simulated"
+    games_simulated: "Simulované hry"
-#    games_played: "Games played"
+    games_played: "Odohrané hry"
-#    ratio: "Ratio"
+    ratio: "Pomer"
-#    leaderboard: "Leaderboard"
+    leaderboard: "Rebríček"
-#    battle_as: "Battle as "
+    battle_as: "Hraj ako "
-#    summary_your: "Your "
+    summary_your: "Tvoje "
-#    summary_matches: "Matches - "
+    summary_matches: "Súboje - počet výhier "
-#    summary_wins: " Wins, "
+    summary_wins: ", počet prehier "
-#    summary_losses: " Losses"
+    summary_losses: " "
-#    rank_no_code: "No New Code to Rank"
+    rank_no_code: "Žiadny nový kód na ocenenie"
-#    rank_my_game: "Rank My Game!"
+    rank_my_game: "Oceň moju hru !"
-#    rank_submitting: "Submitting..."
+    rank_submitting: "Odosielam..."
-#    rank_submitted: "Submitted for Ranking"
+    rank_submitted: "Odoslané na ocenenie"
-#    rank_failed: "Failed to Rank"
+    rank_failed: "Chyba pri oceňovaní"
-#    rank_being_ranked: "Game Being Ranked"
+    rank_being_ranked: "Hra je oceňovaná"
-#    rank_last_submitted: "submitted "
+    rank_last_submitted: "odoslané "
-#    help_simulate: "Help simulate games?"
+    help_simulate: "Pomôžeš so simuláciou hier ?"
-#    code_being_simulated: "Your new code is being simulated by other players for ranking. This will refresh as new matches come in."
+    code_being_simulated: "Tvoj nový kód je simulovaný iným hráčom. Rebríček sa obnoví po nových súbojoch."
-#    no_ranked_matches_pre: "No ranked matches for the "
+    no_ranked_matches_pre: "Žiadne ocenené súboje pre "
-#    no_ranked_matches_post: " team! Play against some competitors and then come back here to get your game ranked."
+    no_ranked_matches_post: " tím ! Hraj proti súperom a potom sa sem vráť a  uvidíš ocenenie svojej hry."
-#    choose_opponent: "Choose an Opponent"
+    choose_opponent: "Vyber si súpera"
-#    select_your_language: "Select your language!"
+    select_your_language: "Vyber si jazyk !"
-#    tutorial_play: "Play Tutorial"
+    tutorial_play: "Hraj tutoriál"
-#    tutorial_recommended: "Recommended if you've never played before"
+    tutorial_recommended: "Odporúčané, pokiaľ si ešte nikdy nehral"
-#    tutorial_skip: "Skip Tutorial"
+    tutorial_skip: "Preskoč tutoriál"
-#    tutorial_not_sure: "Not sure what's going on?"
+    tutorial_not_sure: "Nie si si istý, čo sa deje ?"
-#    tutorial_play_first: "Play the Tutorial first."
+    tutorial_play_first: "Hraj najskôr tutoriál."
-#    simple_ai: "Simple AI"
+    simple_ai: "Jednoduchá umelá inteligencia"
-#    warmup: "Warmup"
+    warmup: "Na rozohratie"
-#    friends_playing: "Friends Playing"
+    friends_playing: "Hra proti priateľom"
-#    log_in_for_friends: "Log in to play with your friends!"
+    log_in_for_friends: "Prihlás sa a hraj s priateľmi !"
-#    social_connect_blurb: "Connect and play against your friends!"
+    social_connect_blurb: "Pripoj sa a hraj proti svojím priateľom !"
-#    invite_friends_to_battle: "Invite your friends to join you in battle!"
+    invite_friends_to_battle: "Pozvi priateľov a bojuj s nimi !"
 #    fight: "Fight!"
 #    watch_victory: "Watch your victory"
 #    defeat_the: "Defeat the"

app/templates/play/campaign-view.jade

@@ -15,8 +15,8 @@ if campaign
           if level.unlocksHero && (!level.purchasedHero || editorMode)
             img.hero-portrait(src="/file/db/thang.type/#{level.unlocksHero}/portrait.png")
           a(href=level.type == 'hero' ? '#' : level.disabled ? "/play" : "/play/#{level.levelPath || 'level'}/#{level.slug}", disabled=level.disabled, data-level-slug=level.slug, data-level-path=level.levelPath || 'level', data-level-name=level.name)
-          if level.slug == 'apocalypse'
+          if level.slug == 'lost-viking'
-            img.star(src="/file/db/thang.type/54ea89112b7506e891ca717d/portrait.png")
+            img.star(src="/file/db/thang.type/5441c3144e9aeb727cc97111/portrait.png")
           else if level.requiresSubscription
             img.star(src="/images/pages/play/star.png")
           if levelStatusMap[level.slug] === 'complete'

app/templates/play/menu/guide-view.jade

@@ -14,6 +14,14 @@ if docs.length === 1
     hr
     h3 Want more programming lessons?
     ul
+      li
+        strong
+          a(class="resource-link", data-resource="breakout-mentors", href='http://breakoutmentors.com/?referral=codecombat') Breakout Mentors
+        | : Personalized code mentoring for kids from Stanford and UC Berkeley mentors, online or in person.
+      li
+        strong
+          a(class="resource-link", data-resource="ostraining", href='https://www.ostraining.com/codecombat/') OSTraining
+        | : Watch over 2600 videos on how to make great websites with Wordpress, Drupal, Joomla, and more.
       li
         strong
           a(class="resource-link", data-resource="one-month", href='http://mbsy.co/bVRtZ') One Month

app/views/play/CampaignView.coffee

@@ -334,7 +334,7 @@ module.exports = class CampaignView extends RootView
     @particleMan ?= new ParticleMan()
     @particleMan.removeEmitters()
     @particleMan.attach @$el.find('.map')
-    for level in @campaign.renderedLevels ? {} when level.hidden or level.slug is 'apocalypse'
+    for level in @campaign.renderedLevels ? {} when level.hidden or (level.slug is 'apocalypse' and @levelStatusMap[level.slug] isnt 'complete')
       particleKey = ['level', @terrain]
       particleKey.push level.type if level.type and level.type isnt 'hero'
       particleKey.push 'premium' if level.requiresSubscription

app/views/play/level/tome/SpellListTabEntryView.coffee

@@ -154,7 +154,7 @@ module.exports = class SpellListTabEntryView extends SpellListEntryView
         break
     $codearea = $('#code-area')
     $codearea.on transitionListener, =>
-      $codearea.css 'z-index', 1 unless $('html').hasClass 'fullscreen-editor'
+      $codearea.css 'z-index', 2 unless $('html').hasClass 'fullscreen-editor'
 
 
   destroy: ->

server/routes/mail.coffee

@@ -727,8 +727,9 @@ sendNextStepsEmail = (user, now, daysAgo) ->
         'maker-square': isAdult and isFast
         'the-firehose-project': isAdult and isFast
         #'mv-code-club': isKid  # TODO: geodetect, get landing page URL
+        'breakout-mentors': isKid
       nAdditionalOffers = Math.max 0, 4 - _.filter(offers).length
-      possibleAdditionalOffers = ['code-school', 'one-month', 'learnable', 'pluralsight']
+      possibleAdditionalOffers = ['ostraining', 'code-school', 'one-month', 'learnable', 'pluralsight']
       for offer in _.sample possibleAdditionalOffers, nAdditionalOffers
         offers[offer] = true
       if user.isPremium()