Merge branch 'master' of https://github.com/codecombat/codecombat

app/application.coffee

@@ -5,6 +5,8 @@ locale = require 'locale/locale'
 Tracker = require 'lib/Tracker'
 CocoView = require 'views/kinds/CocoView'
 
+marked.setOptions {gfm: true, sanitize: true, smartLists: true, breaks: false}
+
 # Prevent Ctrl/Cmd + [ / ], P, S
 ctrlDefaultPrevented = [219, 221, 80, 83]
 preventBackspace = (event) ->

app/locale/en.coffee

@@ -204,6 +204,8 @@
     candidate_top_skills: "Top Skills"
     candidate_years_experience: "Yrs Exp"
     candidate_last_updated: "Last Updated"
+    candidate_approved: "Us?"
+    candidate_active: "Them?"
 
   play_level:
     level_load_error: "Level could not be loaded: "

app/templates/employers.jade

@@ -27,8 +27,8 @@ block content
           th(data-i18n="employers.candidate_years_experience") Yrs Exp
           th(data-i18n="employers.candidate_last_updated") Last Updated
           if me.isAdmin()
-            th Us?
-            th Them?
+            th(data-i18n="employers.candidate_us") Us?
+            th(data-i18n="employers.candidate_them") Them?
   
       tbody
         for candidate, index in candidates

app/views/play/level/modal/docs_modal.coffee

@@ -24,7 +24,6 @@ module.exports = class DocsModal extends View
     general = (article.attributes for article in general when article)
 
     @docs = specific.concat(general)
-    marked.setOptions {gfm: true, sanitize: false, smartLists: true, breaks: false}
     @docs = $.extend(true, [], @docs)
     doc.html = marked(utils.i18n doc, 'body') for doc in @docs
     doc.name = (utils.i18n doc, 'name') for doc in @docs

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

@@ -6,9 +6,6 @@ filters = require 'lib/image_filter'
 {downTheChain} = require 'lib/world/world_utils'
 window.Vector = require 'lib/world/vector'  # So we can document it
 
-# If we use marked somewhere else, we'll have to make sure to preserve options
-marked.setOptions {gfm: true, sanitize: false, smartLists: true, breaks: true}
-
 safeJSONStringify = (input, maxDepth) ->
   recursion = (input, path, depth) ->
     output = {}