Merge pull request #34336 from code-dot-org/dtl_candidate_5034145d

Gemfile

@@ -215,7 +215,6 @@ gem 'therubyracer', '~> 0.12.2', platforms: :ruby
 gem 'jwt' # single signon for zendesk
 
 gem 'codemirror-rails' # edit code in textarea
-gem 'marked-rails' # js-based md renderer used for levelbuilder md preview
 
 gem 'twilio-ruby' # SMS API for send-to-phone feature
 

Gemfile.lock

@@ -524,7 +524,6 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marked-rails (0.3.2.0)
     memoist (0.16.0)
     memory_profiler (0.9.10)
     metaclass (0.0.4)
@@ -958,7 +957,6 @@ DEPENDENCIES
   le (~> 2.2)
   lograge!
   loofah (~> 2.2.1)
-  marked-rails
   memory_profiler
   mini_magick (>= 4.9.4)
   minitest (~> 5.5)

apps/Gruntfile.js

@@ -279,12 +279,6 @@ describe('entry tests', () => {
           src: ['*.js'],
           dest: 'build/minifiable-lib/tooltipster/'
         },
-        {
-          expand: true,
-          cwd: 'lib/marked',
-          src: ['marked*.js'],
-          dest: 'build/minifiable-lib/marked/'
-        },
         {
           expand: true,
           cwd: 'lib/phaser',

apps/i18n/common/en_us.json

@@ -307,6 +307,19 @@
   "copyright": "Copyright",
   "correct": "Correct",
   "correctAnswer": "That is the correct answer.",
+  "costumeCategoryAll": "All",
+  "costumeCategoryAnimals": "Animals",
+  "costumeCategoryBackground": "Backgrounds",
+  "costumeCategoryBoardGames": "Board games",
+  "costumeCategoryCharacters": "Characters",
+  "costumeCategoryEnvironment": "Environment",
+  "costumeCategoryFood": "Food",
+  "costumeCategoryGameplay": "Gameplay",
+  "costumeCategoryGenericItems": "Generic items",
+  "costumeCategoryMusic": "Music",
+  "costumeCategoryObstacles": "Obstacles",
+  "costumeCategoryTools": "Tools",
+  "costumeCategoryVehicles": "Vehicles",
   "costumeMode": "Costumes",
   "count": "Count",
   "country": "Country",
@@ -373,7 +386,7 @@
   "coursesLearnHeroSubHeading": "{studentsCount} million students have learned on Code.org!",
   "coursesTeachHeroButton": "Get started",
   "coursesTeachHeroDescription": "More than one million teachers have brought CS to their students using Code.org. We make it easy, no matter your background. ",
-  "coursesTeachHeroHeading": "You Can Teach Computer Science",
+  "coursesTeachHeroHeading": "You can teach computer science",
   "coursesTeachHeroSubHeading": "You don't have to be a software developer to teach computer science.",
   "courseOverviewVersionLabel": "Version:",
   "create": "Create",
@@ -1131,6 +1144,34 @@
   "parent": "Parent",
   "parents": "Parents",
   "parentsAndStudents": "Parents and Students",
+  "parentLetterClever1": "Have your students log in to their Clever account at [www.clever.com]({cleverLink}) (click \"Sign in as a student\" at the top right)",
+  "parentLetterClever2": "Click on the Code.org logo on the Clever dashboard. The logo looks like this:",
+  "parentLetterClosing": "Please let me know if you have any questions and thank you for your continued support of your child and of our classroom!",
+  "parentLetterCodeBreak": "Join the weekly \"Code Break\" every Wednesday",
+  "parentLetterCodeBreakDetails": "The team at Code.org hosts a live interactive classroom for students of all ages. Anybody can participate, and learn computer science in a fun format starring very special guests. [More info]({codebreakLink})",
+  "parentLetterForgotPassword": "If your student does not remember their password, please email me and I will provide it",
+  "parentLetterForgotPasswordEmail": "If your student does not remember their password, they can reset it from the sign in screen",
+  "parentLetterForgotPicturePassword": "If your student does not remember their picture password, please email me and I will provide it",
+  "parentLetterGoogle1": "Choose 'Sign in with Google'",
+  "parentLetterGoogle2": "Sign in via the Google sign-in dialog",
+  "parentLetterHello": "Hello!",
+  "parentLetterIntro": "In my class, {studentName} is learning computer science on [Code.org]({homeLink}), a fun, creative platform for learning computer science and basic coding to create interactive animations, games, or apps. Your interest in what your child is learning is critical, and Code.org makes it easy to stay involved.",
+  "parentLetterLoginType": "Our class uses **{loginTypeName}** to sign in. To have your student sign in to Code.org at home, do the following:",
+  "parentLetterPicturePassword": "Click on their picture password and then click 'Sign in'",
+  "parentLetterSectionSignIn": "Go to [{sectionLink}]({sectionLink}) and click on their name",
+  "parentLetterSecretWords": "Type in their secret words {secretWords} and then click 'Sign in'",
+  "parentLetterSignIn": "Go to [{studioLink}]({studioLink}) and click 'Sign In'",
+  "parentLetterSignInEmail": "Have them enter their email and password and then click 'Sign In'",
+  "parentLetterStep1": "Step 1 - Encourage your child, show interest in computer science",
+  "parentLetterStep1Details": "One of the best ways is to ask your child to explain what they’re learning and show you a project they are proud of, [see details]({engagementLink}). Or watch one of these [videos]({videosLink}) together.",
+  "parentLetterStep2": "Step 2 - Get your child set up to use Code.org at home",
+  "parentLetterStep2Details": "At the top of their homepage, {studentName} can continue the course they are doing with their classroom at school. They can also create their own [games or artwork in the Project Gallery]({projectsLink}) or check out [code.org/athome]({atHomeLink}) for ideas for things to work on at home.",
+  "parentLetterStep3": "Step 3 - Connect your email to your student's account",
+  "parentLetterStep3Details": "Keep up to date with what your student is working on and receive updates from Code.org. Have your child sign in to Code.org and then enter your email in Account Settings or [click here]({accountEditLink}).",
+  "parentLetterStudentPrivacy": "Code.org's commitment to student privacy",
+  "parentLetterStudentPrivacyDetails": "Code.org assigns utmost importance to student safety and security. Code.org has signed the [Student Privacy Pledge]({pledgeLink}) and their privacy practices have received [one of the highest overall scores from Common Sense Media]({commonSenseLink}). You can find further details by viewing Code.org's [Privacy Policy]({privacyPolicyLink}).",
+  "parentLetterWhy": "Why computer science",
+  "parentLetterWhyDetails": "Computer science teaches students critical thinking, problem solving, and digital citizenship, and benefits all students, no matter what opportunities they pursue in the future. And learning to make interactive animations, code-art, games, and apps on Code.org encourages creativity and makes learning fun.",
   "partner": "Partner: {partner}",
   "password": "Password",
   "passwordConfirmation": "Password confirmation",

apps/lib/blockly/fr_fr.js

@@ -39,7 +39,7 @@ Blockly.Msg.CONTROLS_FOREACH_INPUT_INLIST = "dans la liste";
 Blockly.Msg.CONTROLS_FOREACH_INPUT_ITEM = "pour chaque élément";
 Blockly.Msg.CONTROLS_FOREACH_TOOLTIP = "Pour chaque élément dans une liste, donner à la variable '%1' la valeur de l'élément, puis exécuter certaines instructions.";
 Blockly.Msg.CONTROLS_FOR_HELPURL = "https://code.google.com/p/blockly/wiki/Loops#count_with";
-Blockly.Msg.CONTROLS_FOR_INPUT_COUNTER = "pour %1 de %2 à %3, de %4 en %4";
+Blockly.Msg.CONTROLS_FOR_INPUT_COUNTER = "pour %1 de %2 à %3 compte par %4";
 Blockly.Msg.CONTROLS_FOR_INPUT_FROM_TO_BY = "de %1 à %2 par %3";
 Blockly.Msg.CONTROLS_FOR_INPUT_WITH = "pour";
 Blockly.Msg.CONTROLS_FOR_TOOLTIP = "Faire en sorte que la variable %1 prenne les valeurs depuis le nombre de départ jusqu’au nombre final par incrément spécifié, en faisant les blocs spécifiés.";