Merge branch 'master' into production

README.md

@@ -14,7 +14,7 @@ We've made it easy to fork the project, run a simple script that'll install all
 
 ### [Getting In Touch](https://github.com/codecombat/codecombat/wiki/Developer-organization)
 
-Whether you're novice or pro, the CodeCombat team is ready to help you implement your ideas. Reach out on our [forum](discourse.codecombat.com), our [issue tracker](https://github.com/codecombat/codecombat/issues), or our [developer chat room](https://www.hipchat.com/g3plnOKqa), or see the docs for [more on how to contribute](https://github.com/codecombat/codecombat/wiki/Developer-organization).
+Whether you're novice or pro, the CodeCombat team is ready to help you implement your ideas. Reach out on our [forum](http://discourse.codecombat.com), our [issue tracker](https://github.com/codecombat/codecombat/issues), or our [developer chat room](https://www.hipchat.com/g3plnOKqa), or see the docs for [more on how to contribute](https://github.com/codecombat/codecombat/wiki/Developer-organization).
 
 ### [License](https://github.com/codecombat/codecombat/blob/master/LICENSE)
 

app/locale/ca.coffee

@@ -139,8 +139,8 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
     books: "Llibres"
 
   common:
-#    back: "Back" # When used as an action verb, like "Navigate backward"
-#    continue: "Continue" # When used as an action verb, like "Continue forward"
+    back: "Endarrere" # When used as an action verb, like "Navigate backward"
+    continue: "Continua" # When used as an action verb, like "Continue forward"
     loading: "Carregant..."
     saving: "Guardant..."
     sending: "Enviant..."
@@ -355,18 +355,18 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
     multiplayer_caption: "Juga amb amics!"
     auth_caption: "Desa el progrés."
 
-#  leaderboard:
+  leaderboard:
 #    leaderboard: "Leaderboard"
-#    view_other_solutions: "View Other Solutions"
-#    scores: "Scores"
-#    top_players: "Top Players by"
-#    day: "Today"
-#    week: "This Week"
-#    all: "All-Time"
-#    time: "Time"
+    view_other_solutions: "Veure altres solucions"
+    scores: "Puntuació"
+    top_players: "Els millors jugadors de"
+    day: "Avui"
+    week: "Aquesta Setmana"
+    all: "Tots els temps"
+    time: "Temps"
 #    damage_taken: "Damage Taken"
 #    damage_dealt: "Damage Dealt"
-#    difficulty: "Difficulty"
+    difficulty: "Difficultat"
 #    gold_collected: "Gold Collected"
 
   inventory:
@@ -390,20 +390,20 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    declined: "Your card was declined"
 #    retrying: "Server error, retrying."
 #    prompt_title: "Not Enough Gems"
-#    prompt_body: "Do you want to get more?"
+    prompt_body: "En vols més?"
     prompt_button: "Entrar a la botiga"
 #    recovered: "Previous gems purchase recovered. Please refresh the page."
 #    or_subscribe: "Or 3500 gems/mo if you..."
 
   subscribe:
 #    comparison_blurb: "Sharpen your skills with a CodeCombat subscription!"
-#    feature1: "60+ basic levels across 4 worlds"
+    feature1: "60+ nivells bàsics a traves de 4 móns"
 #    feature2: "7 powerful <strong>new heroes</strong> with unique skills!"
 #    feature3: "30+ bonus levels"
 #    feature4: "<strong>3500 bonus gems</strong> every month!"
-#    feature5: "Video tutorials"
+    feature5: "Video tutorials"
 #    feature6: "Premium email support"
-#    free: "Free"
+    free: "Gratuit"
 #    month: "month"
     subscribe_title: "Subscriu-te"
 #    unsubscribe: "Unsubscribe"
@@ -416,18 +416,18 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    unsubscribe_feedback_placeholder: "O, what have we done?"
 #    parent_button: "Ask your parent"
 #    parent_email_description: "We'll email them so they can buy you a CodeCombat subscription."
-#    parent_email_input_invalid: "Email address invalid."
+    parent_email_input_invalid: "Adreça electrònica invalida."
 #    parent_email_input_label: "Parent email address"
 #    parent_email_input_placeholder: "Enter parent email"
-#    parent_email_send: "Send Email"
-#    parent_email_sent: "Email sent!"
+    parent_email_send: "Envia correu electrònic"
+    parent_email_sent: "Correu enviat!"
 #    parent_email_title: "What's your parent's email?"
-#    parents: "For Parents"
+    parents: "Per Pares"
 #    parents_title: "Your child will learn to code."
 #    parents_blurb1: "With CodeCombat, your child learns by writing real code. They start by learning simple commands, and progress to more advanced topics."
 #    parents_blurb2: "For $9.99 USD/mo, they get new challenges every week and personal email support from professional programmers."
 #    parents_blurb3: "No Risk: 100% money back guarantee, easy 1-click unsubscribe."
-#    stripe_description: "Monthly Subscription"
+    stripe_description: "Subscripció mensual"
 #    subscription_required_to_play: "You'll need a subscription to play this level."
 #    unlock_help_videos: "Subscribe to unlock all video tutorials."
 
@@ -435,7 +435,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
     choose_hero: "Escull el teu heroi"
     programming_language: "Llenguatge de programació"
     programming_language_description: "Quin llenguatge de programació vols utilitzar?"
-#    default: "Default"
+    default: "Per defecte"
 #    experimental: "Experimental"
     python_blurb: "Simple però poderós, Python és un bon llenguatge d'us general."
     javascript_blurb: "El llenguatge de les webs."
@@ -458,7 +458,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
     skills: "Habilitats"
 #    available_for_purchase: "Available for Purchase" # Shows up when you have unlocked, but not purchased, a hero in the hero store
 #    level_to_unlock: "Level to unlock:" # Label for which level you have to beat to unlock a particular hero (click a locked hero in the store to see)
-#    restricted_to_certain_heroes: "Only certain heroes can play this level."
+    restricted_to_certain_heroes: "Nomès certs herois poden jugar aquest nivell."
 
   skill_docs:
 #    writable: "writable" # Hover over "attack" in Your Skills while playing a level to see most of this
@@ -532,14 +532,14 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
     matt_title: "Programador"
 #    matt_blurb: "Bicyclist"
 
-#  teachers:
-#    title: "CodeCombat for Teachers"
-#    preparation_title: "Preparation"
+  teachers:
+    title: "CodeCombat per a professors"
+    preparation_title: "Preparació"
 #    preparation_1: "CodeCombat is free to play for the core level progression and does not require students to sign up. We encourage teachers to"
 #    preparation_play_campaign: "play through the campaign"
 #    preparation_2: "to try it out, but the only thing you absolutely need to do to be ready is ensure students have access to a computer."
 #    preparation_3: "It is not necessary for teachers to be comfortable with computer science concepts for students to have fun learning with CodeCombat."
-#    violent_title: "Is it violent?"
+    violent_title: "Es violent?"
 #    violent_1: "We get this from teachers a lot due to our name. Although CodeCombat does contain cartoon violence, there is nothing graphic in either the visuals or language."
 #    violent_2: "If you are comfortable having your students play Angry Birds, you will be comfortable with CodeCombat."
 #    for_girls_title: "Is it for girls?"
@@ -550,7 +550,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    what_cover_notation_2: "- builds an understanding of the importance of syntax in programming."
 #    what_cover_methods_1: "Calling methods"
 #    what_cover_methods_2: "- familiarizes students with the syntax of object-oriented method calls."
-#    what_cover_parameters_1: "Parameters"
+    what_cover_parameters_1: "Parametres"
 #    what_cover_parameters_2: "- trains how to pass parameters to functions."
 #    what_cover_strings_1: "Strings"
 #    what_cover_strings_2: "- teaches students about string notation and passing strings as parameters."
@@ -706,9 +706,9 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    revert: "Revert"
 #    revert_models: "Revert Models"
 #    pick_a_terrain: "Pick A Terrain"
-#    dungeon: "Dungeon"
-#    indoor: "Indoor"
-#    desert: "Desert"
+    dungeon: "Masmorra"
+    indoor: "Interior"
+    desert: "Desert"
 #    grassy: "Grassy"
     small: "Petit"
 #    large: "Large"

server/queues/scoring.coffee

@@ -160,9 +160,9 @@ module.exports.getTwoGames = (req, res) ->
         query = LevelSession
           .aggregate()
           .match(queryParams)
-          .project(selection)
           .sort({'submitDate': -1})
           .limit(sortLimit)
+          .project(selection)
           .skip(humanSkipCount)
           .limit(1)
         query.exec (err, randomSession) =>
@@ -175,9 +175,9 @@ module.exports.getTwoGames = (req, res) ->
           query = LevelSession
             .aggregate()
             .match(queryParams)
-            .project(selection)
             .sort({'submitDate': -1})
             .limit(sortLimit)
+            .project(selection)
             .skip(ogresSkipCount)
             .limit(1)
           query.exec (err, otherSession) =>