Merge pull request #13187 from code-dot-org/staging

DTT (Staging > Test)

.rubocop_todo.yml

@@ -59,13 +59,6 @@ Security/JSONLoad:
 Style/AlignHash:
   Enabled: false
 
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
-# SupportedStyles: with_first_parameter, with_fixed_indentation
-Style/AlignParameters:
-  Enabled: false
-
 # Offense count: 417
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
@@ -128,13 +121,6 @@ Style/LeadingCommentSpace:
 Style/MethodMissing:
   Enabled: false
 
-# Offense count: 16
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: symmetrical, new_line, same_line
-Style/MultilineHashBraceLayout:
-  Enabled: false
-
 # Offense count: 18
 # Cop supports --auto-correct.
 Style/MultilineIfModifier:

apps/Gruntfile.js

@@ -422,7 +422,7 @@ module.exports = function (grunt) {
 
     'pd/professional_learning_landing/index': './src/sites/studio/pages/pd/professional_learning_landing/index.js',
 
-    'projects/section_projects': './src/sites/studio/pages/projects/section_projects.js',
+    'teacher-dashboard/index': './src/sites/code.org/pages/teacher-dashboard/index.js',
 
     publicKeyCryptography: './src/publicKeyCryptography/main.js',
 

apps/i18n/bounce/bs_ba.json

@@ -56,12 +56,12 @@
   "pathRight": "ako je staza desno",
   "pilePresent": "ovdje je hrpa",
   "playSoundBounce": "pusti zvuk odskakanja",
-  "playSoundCheer": "play cheering sound",
+  "playSoundCheer": "pusti zvuk navijanja",
   "playSoundCrunch": "pokreni zvuk krckanja",
   "playSoundGoal1": "pokreni zvuk cilja 1",
   "playSoundGoal2": "pokreni zvuk cilja 2",
   "playSoundHit": "pokreni zvuk udara",
-  "playSoundKick": "play kick sound",
+  "playSoundKick": "pusti zvuk udarca",
   "playSoundLosePoint": "pokreni zvuk gubitka boda",
   "playSoundLosePoint2": "pokreni zvuk izgubljenog boda 2",
   "playSoundRetro": "pokreni retro zvuk",
@@ -70,7 +70,7 @@
   "playSoundSlapshot": "play slapshot sound",
   "playSoundSwish": "play net swish sound",
   "playSoundTooltip": "Pusti odrabrani zvuk.",
-  "playSoundWhistle": "play whistle sound",
+  "playSoundWhistle": "pusti zvuk zvižduka",
   "playSoundWinPoint": "pokreni zvuk osvojenog poena",
   "playSoundWinPoint2": "pokreni zvuk 2 za osvojeni poen",
   "playSoundWood": "pokreni zvuk drveta",

apps/i18n/bounce/de_de.json

@@ -2,7 +2,7 @@
   "basketballLaunchBall": "neuen Ball werfen",
   "basketballLaunchBallTooltip": "Einen neuen Ball ins Spiel bringen.",
   "basketballSetPaddle": "Spielgeschwindigkeit festlegen",
-  "basketballSetPaddleSpeedFast": "setze Spielgeschwindigkeit: schnell",
+  "basketballSetPaddleSpeedFast": "Spielgeschwindigkeit: schnell",
   "basketballSetPaddleSpeedNormal": "setze Spielgeschwindigkeit: Mittel",
   "basketballSetPaddleSpeedRandom": "setze Spielgeschwindigkeit: zufällig",
   "basketballSetPaddleSpeedSlow": "setze Spielgeschwindigkeit: langsam",

apps/i18n/bounce/en_gb.json

@@ -118,7 +118,7 @@
   "setPlayerSpeedTooltip": "Sets the speed of the player",
   "setPlayerSpeedVeryFast": "set very fast player speed",
   "setPlayerSpeedVerySlow": "set very slow player speed",
-  "setTeamTooltip": "Sets the logo and color scheme",
+  "setTeamTooltip": "Sets the logo and colour scheme",
   "setTeam": "Set team {team}",
   "setTeamRandom": "Set team random",
   "shareBounceTwitter": "Check out the Bounce game I made. I wrote it myself with @codeorg",

apps/i18n/bounce/fr_fr.json

@@ -1,15 +1,15 @@
 {
   "basketballLaunchBall": "lance un nouveau ballon",
   "basketballLaunchBallTooltip": "met une balle en jeu.",
-  "basketballSetPaddle": "régler la main",
-  "basketballSetPaddleSpeedFast": "régler la vitesse de main sur rapide",
-  "basketballSetPaddleSpeedNormal": "régler la vitesse de main sur normal",
-  "basketballSetPaddleSpeedRandom": "régler la vitesse de main aléatoire",
-  "basketballSetPaddleSpeedSlow": "régler la vitesse de main lente",
+  "basketballSetPaddle": "régler les paramètres de la main",
+  "basketballSetPaddleSpeedFast": "régler la vitesse de la main sur rapide",
+  "basketballSetPaddleSpeedNormal": "régler la vitesse de la main sur normale",
+  "basketballSetPaddleSpeedRandom": "régler la vitesse de la main de façon aléatoire",
+  "basketballSetPaddleSpeedSlow": "régler la vitesse de la main sur lente",
   "basketballSetPaddleSpeedTooltip": "Définit la vitesse de la main",
   "basketballSetPaddleSpeedVeryFast": "définir vitesse de main rapide",
-  "basketballSetPaddleSpeedVerySlow": "définir vitesse de main lente",
-  "basketballWhenBallMissesPaddle": "lorsque la balle rate la main",
+  "basketballSetPaddleSpeedVerySlow": "régler la vitesse de la main sur très lente",
+  "basketballWhenBallMissesPaddle": "lorsque la balle passe à côté de la main",
   "basketballWhenPaddleCollided": "lorsque la balle touche la main",
   "bounceBall": "faire rebondir la balle",
   "bounceBallTooltip": "Faire rebondir une balle sur un objet.",
@@ -56,7 +56,7 @@
   "pathRight": "si chemin à droite",
   "pilePresent": "Il y a une pile",
   "playSoundBounce": "jouer un son de rebonds",
-  "playSoundCheer": "jouer le son applaudissements",
+  "playSoundCheer": "jouer le son d'applaudissements",
   "playSoundCrunch": "jouer le son accroupir",
   "playSoundGoal1": "jouer le son du 1<sup>er</sup> but",
   "playSoundGoal2": "jouer le son 2<sup>e</sup> but",
@@ -67,10 +67,10 @@
   "playSoundRetro": "jouer un son rétro",
   "playSoundRubber": "jouer un son de caoutchouc",
   "playSoundSlap": "jouer un son de claque",
-  "playSoundSlapshot": "jouer le son d'une giffle",
+  "playSoundSlapshot": "émettre un son de giffle",
   "playSoundSwish": "jouer le son d'un interrupteur",
   "playSoundTooltip": "Jouer le son choisi.",
-  "playSoundWhistle": "jouer le son sifflet",
+  "playSoundWhistle": "émettre un son de sifflet",
   "playSoundWinPoint": "jouer le son «&#160;gagner un point&#160;»",
   "playSoundWinPoint2": "jouer le 2<sup>e</sup> son « gagner un point »",
   "playSoundWood": "jouer un son de bois",
@@ -116,9 +116,9 @@
   "setPlayerSpeedRandom": "Régler la vitesse du joueur aléatoirement",
   "setPlayerSpeedSlow": "Régler la vitesse lente du joueur",
   "setPlayerSpeedTooltip": "Définit la vitesse du joueur",
-  "setPlayerSpeedVeryFast": "régler la vitesse très rapide du joueur",
-  "setPlayerSpeedVerySlow": "régler la vitesse du joueur très lente",
-  "setTeamTooltip": "Définir le logo et les couleurs",
+  "setPlayerSpeedVeryFast": "régler la vitesse du joueur sur très rapide",
+  "setPlayerSpeedVerySlow": "régler la vitesse du joueur sur très lente",
+  "setTeamTooltip": "Définit le logo et le jeu de couleurs",
   "setTeam": "Définir équipe {team}",
   "setTeamRandom": "Définir l'équipe aléatoirement",
   "shareBounceTwitter": "Découvrez le jeu de rebond que j'ai créé. Je l'ai écrit moi-même avec @codeorg",
@@ -130,7 +130,7 @@
   "whenBallInGoalTooltip": "Exécuter les actions ci-dessous lorsqu'une balle entre dans le but.",
   "whenBallMissesPaddle": "quand la balle manque la raquette",
   "whenBallMissesPaddleTooltip": "Exécuter les actions ci-dessous quand une balle manque la raquette.",
-  "whenBallMissesPlayer": "quand la balle manque le joueur",
+  "whenBallMissesPlayer": "quand le ballon touche le joueur",
   "whenDown": "quand « flèche vers le bas »",
   "whenDownTooltip": "Exécuter les actions ci-dessous lorsque le joueur appuie sur la touche «&#160;flèche vers le bas&#160;».",
   "whenGameStarts": "lors du lancement du jeu",

apps/i18n/bounce/hy_am.json

@@ -1,7 +1,7 @@
 {
-  "basketballLaunchBall": "throw new ball",
-  "basketballLaunchBallTooltip": "Throw a ball into play.",
-  "basketballSetPaddle": "set hand",
+  "basketballLaunchBall": "գցել նոր գնդակ",
+  "basketballLaunchBallTooltip": "Գցել գնդակը խաղի մեջ:",
+  "basketballSetPaddle": "ուժի հավաքում",
   "basketballSetPaddleSpeedFast": "set fast hand speed",
   "basketballSetPaddleSpeedNormal": "set normal hand speed",
   "basketballSetPaddleSpeedRandom": "set random hand speed",

apps/i18n/bounce/ku_iq.json

@@ -3,7 +3,7 @@
   "basketballLaunchBallTooltip": "Throw a ball into play.",
   "basketballSetPaddle": "set hand",
   "basketballSetPaddleSpeedFast": "set fast hand speed",
-  "basketballSetPaddleSpeedNormal": "set normal hand speed",
+  "basketballSetPaddleSpeedNormal": "دانانی خێرایی ئاسایی دەست",
   "basketballSetPaddleSpeedRandom": "set random hand speed",
   "basketballSetPaddleSpeedSlow": "set slow hand speed",
   "basketballSetPaddleSpeedTooltip": "Sets the speed of the hand",

apps/i18n/bounce/pt_br.json

@@ -56,18 +56,18 @@
   "pathRight": "se houver caminho à direita",
   "pilePresent": "houver uma pilha",
   "playSoundBounce": "reproduza som de bola pulando",
-  "playSoundCheer": "reproduza barulho de asas batendo",
+  "playSoundCheer": "reproduzir aplausos",
   "playSoundCrunch": "reproduza barulho de trituração",
   "playSoundGoal1": "reproduza som de objetivo alcançado 1",
   "playSoundGoal2": "reproduza som de objetivo alcançado 2",
   "playSoundHit": "reproduza barulho de pancada",
-  "playSoundKick": "reproduza o barulho de chute",
+  "playSoundKick": "reproduza som de chute",
   "playSoundLosePoint": "reproduza som de ponto perdido",
   "playSoundLosePoint2": "reproduza som de ponto perdido 2",
   "playSoundRetro": "reproduza som retrô",
   "playSoundRubber": "reproduza som de borracha",
   "playSoundSlap": "reproduza som de palmas",
-  "playSoundSlapshot": "reproduza barulho de slapshot",
+  "playSoundSlapshot": "reproduzir som de palmas",
   "playSoundSwish": "reproduza barulho de agitação de rede",
   "playSoundTooltip": "Reproduza o som escolhido.",
   "playSoundWhistle": "reproduza som de apito",

apps/i18n/bounce/pt_pt.json

@@ -1,10 +1,10 @@
 {
-  "basketballLaunchBall": "lançar uma bola nova",
-  "basketballLaunchBallTooltip": "Lança a bola para jogo.",
-  "basketballSetPaddle": "coloque a mão",
-  "basketballSetPaddleSpeedFast": "definir a velocidade rápida de mão",
-  "basketballSetPaddleSpeedNormal": "definir a velocidade normal da mão",
-  "basketballSetPaddleSpeedRandom": "definir velocidade da mão aleatória",
+  "basketballLaunchBall": "atirar outra bola",
+  "basketballLaunchBallTooltip": "Atirar uma bola para o jogo.",
+  "basketballSetPaddle": "definir mão",
+  "basketballSetPaddleSpeedFast": "definir a velocidade da mão como: rápida",
+  "basketballSetPaddleSpeedNormal": "definir a velocidade da mão como: normal",
+  "basketballSetPaddleSpeedRandom": "definir a velocidade da mão como: aleatória",
   "basketballSetPaddleSpeedSlow": "definir velocidade da mão lenta",
   "basketballSetPaddleSpeedTooltip": "Define a velocidade da mão",
   "basketballSetPaddleSpeedVeryFast": "definir velocidade de mão muito rápida",

apps/i18n/bounce/uz_uz.json

@@ -1,9 +1,9 @@
 {
   "basketballLaunchBall": "yangi koptokni oting",
   "basketballLaunchBallTooltip": "O'yinga koptok oting.",
-  "basketballSetPaddle": "set hand",
-  "basketballSetPaddleSpeedFast": "set fast hand speed",
-  "basketballSetPaddleSpeedNormal": "set normal hand speed",
+  "basketballSetPaddle": "qo‘lni belgilang",
+  "basketballSetPaddleSpeedFast": "tez qo‘l tezligi",
+  "basketballSetPaddleSpeedNormal": "o‘rtacha qo‘l tezligi",
   "basketballSetPaddleSpeedRandom": "set random hand speed",
   "basketballSetPaddleSpeedSlow": "set slow hand speed",
   "basketballSetPaddleSpeedTooltip": "Sets the speed of the hand",

apps/i18n/bounce/vi_vn.json

@@ -68,9 +68,9 @@
   "playSoundRubber": "phát âm thanh cao su",
   "playSoundSlap": "phát âm thanh vỗ tay",
   "playSoundSlapshot": "bật âm thanh slapshot",
-  "playSoundSwish": "play net swish sound",
+  "playSoundSwish": "phát âm thanh swish net",
   "playSoundTooltip": "Phát âm thanh đã chọn.",
-  "playSoundWhistle": "play whistle sound",
+  "playSoundWhistle": "chơi còi âm thanh",
   "playSoundWinPoint": "phát âm thanh thắng 1 điểm",
   "playSoundWinPoint2": "phát âm thanh thắng 2 điểm",
   "playSoundWood": "phát âm thanh gỗ",
@@ -89,7 +89,7 @@
   "setBallHardcourt": "thiết lập số bóng",
   "setBallRandom": "thiết lập bóng ngẫu nhiên",
   "setBallRetro": "Thiết bóng chạy lùi",
-  "setBall": "set {ball} ball",
+  "setBall": "thiết lập {ball} bóng",
   "setBallSpeedFast": "thiết lập tốc độ bóng nhanh",
   "setBallSpeedNormal": "thiết lập tốc độ bóng bình thường",
   "setBallSpeedRandom": "thiết lập tốc độ bóng ngẫu nhiên",
@@ -98,7 +98,7 @@
   "setBallSpeedVeryFast": "thiết lập tốc độ bóng rất nhanh",
   "setBallSpeedVerySlow": "thiết lập tốc độ bóng rất chậm",
   "setBallTooltip": "Thiết lập hình ảnh bóng",
-  "setPaddle": "set paddle",
+  "setPaddle": "thiết lập các mái chèo",
   "setPaddleHardcourt": "thiết lập độ cứng mặt đập bóng",
   "setPaddleRandom": "thiết lập mái chèo ngẫu nhiên",
   "setPaddleRetro": "thiết lập mặt phía sau",
@@ -119,8 +119,8 @@
   "setPlayerSpeedVeryFast": "thiết lập tốc độ của người chơi: rất nhanh",
   "setPlayerSpeedVerySlow": "thiết lập tốc độ của người chơi: rất chậm",
   "setTeamTooltip": "Thiết lập biểu tượng và màu sắc kế hoạch",
-  "setTeam": "Set team {team}",
-  "setTeamRandom": "Set team random",
+  "setTeam": "Thiết lập nhóm {team}",
+  "setTeamRandom": "Thiết lập nhóm ngẫu nhiên",
   "shareBounceTwitter": "Hãy xem game \"tưng bóng\" mà tôi đã làm nè. Tôi đã tự lập trình nó @codeorg",
   "shareGame": "Chia sẻ trò chơi của bạn:",
   "turnLeft": "rẽ trái",

apps/i18n/bounce/zh_tw.json

@@ -1,5 +1,5 @@
 {
-  "basketballLaunchBall": "扔出新的球",
+  "basketballLaunchBall": "扔出新球",
   "basketballLaunchBallTooltip": "扔顆球到場中。",
   "basketballSetPaddle": "設定手",
   "basketballSetPaddleSpeedFast": "手的移速設為快",
@@ -36,15 +36,15 @@
   "launchBallTooltip": "放一顆球進入場中。",
   "makeYourOwn": "設計你自己的彈跳球遊戲",
   "moveDown": "移動-向下",
-  "moveDownTooltip": "球拍向下移動。",
+  "moveDownTooltip": "讓球拍向下移動。",
   "moveForward": "移動-向前",
   "moveForwardTooltip": "將角色向前移動一格。",
   "moveLeft": "移動-向左",
-  "moveLeftTooltip": "球拍移到左邊。",
+  "moveLeftTooltip": "讓球拍向左移動。",
   "moveRight": "移動-向右",
-  "moveRightTooltip": "球拍向右移動。",
+  "moveRightTooltip": "讓球拍向右移動。",
   "moveUp": "移動-向上",
-  "moveUpTooltip": "球拍向上移動。",
+  "moveUpTooltip": "讓球拍向上移動。",
   "nextLevel": "恭喜！你已經完成這個關卡。",
   "no": "否",
   "noPathAhead": "路被堵住了",
@@ -98,7 +98,7 @@
   "setBallSpeedVeryFast": "球的移速設為很快",
   "setBallSpeedVerySlow": "球的移速設為很慢",
   "setBallTooltip": "設定球的外觀",
-  "setPaddle": "設定球拍",
+  "setPaddle": "球拍設置",
   "setPaddleHardcourt": "球拍設為硬式網球拍",
   "setPaddleRandom": "球拍設為隨機",
   "setPaddleRetro": "球拍設為復古",
@@ -128,7 +128,7 @@
   "turnTooltip": "讓角色向左或向右轉 90 度。",
   "whenBallInGoal": "當球命中目標時",
   "whenBallInGoalTooltip": "當球進入目標區時，執行下面的操作。",
-  "whenBallMissesPaddle": "當球拍沒有碰到球時",
+  "whenBallMissesPaddle": "當球沒有碰到球拍時",
   "whenBallMissesPaddleTooltip": "當球拍沒有碰到球時，執行下面的操作。",
   "whenBallMissesPlayer": "當球沒有碰到球員時",
   "whenDown": "當按向下鍵時",

apps/i18n/common/ar_sa.json

@@ -60,6 +60,7 @@
   "disabledProgress1": "أي تقدم تقوم به على مسارك الخاص لن يتم حفظه منذ 3 -11 ديسمبر بسبب مستوى الازدحام اللذي يستقبله موقع ساعة من البرمجة خلال هذا الوقت.",
   "disabledProgress2": "هذا السبب اللذي يجعل عرض فقاعتك بالرمادي (لا تقلق, التقدم الذي أحرزته قبل هذا الاسبوع ما زالت محفوظة).",
   "disabledProgress3": "نحن نشجعك لتجرب تدريس ساعة من البرمجة بدلاً من هذا الاسبوع.",
+  "documentation": "Documentation",
   "dontForget": "لا تنسى",
   "dropletBlock_addOperator_description": "جمع رقمين",
   "dropletBlock_addOperator_signatureOverride": "علامة الجمع",
@@ -198,7 +199,10 @@
   "keyValuePairLink": "أزواج المفاتيح / القيم",
   "learnMore": "اعرف المزيد",
   "less": "أقل",
+  "lessonName": "Lesson Name",
+  "lessonNumbered": "Lesson {lessonNumber}: {lessonName}",
   "levelIncompleteError": "أنت استخدمت كل أنواع المربعات البرمجية الضرورية ولكن ليس في الطريقة الصحيحة.",
+  "levelN": "LEVEL {levelNumber}",
   "listVariable": "قائمة",
   "loading": "جاري التحميل...",
   "locked": "مقفل",
@@ -246,6 +250,7 @@
   "positionTopOutRight": "إلى الموضع الأعلى الأيمن الخارجي",
   "positionTopRight": "إلى الموضع الأيمن الأعلى",
   "predictionInstructions": "أصنع نبؤة قبل تشغيل البرنامج.",
+  "projectTypeAlgebra": "Algebra",
   "projectTypeApplab": "مختبر التطبيق",
   "projectTypeArtist": "الرسام",
   "projectTypeGamelab": "Game Lab",
@@ -333,10 +338,5 @@
   "whenRun": "عند التشغيل",
   "workspaceHeaderShort": "مساحة العمل: ",
   "yes": "نعم",
-  "documentation": "Documentation",
-  "lessonName": "Lesson Name",
-  "lessonNumbered": "Lesson {lessonNumber}: {lessonName}",
-  "levelN": "LEVEL {levelNumber}",
-  "projectTypeAlgebra": "Algebra",
   "yourProgress": "Your Progress"
 }

apps/i18n/common/az_az.json

@@ -60,6 +60,7 @@
   "disabledProgress1": "Bu həftə kursunuzdakı nəticələriniz, saytımızın Kod Saatı bölümünün aldığı trafik səviyəsindən ötəri yadda saxlanılmayacaq.",
   "disabledProgress2": "Buna görə bütün köpüklər boz olaraq göstərilir (narahat olmayın, bu həftədən əvvəlki nəticələriniz hələ də güvəndədir).",
   "disabledProgress3": "Bu hafta Kod Saatı dərsliklərini sınaqdan keçirməyinizi təklif edirik.",
+  "documentation": "Documentation",
   "dontForget": "Unutma",
   "dropletBlock_addOperator_description": "Add two numbers",
   "dropletBlock_addOperator_signatureOverride": "Add operator",
@@ -198,7 +199,10 @@
   "keyValuePairLink": "Açar cütlər",
   "learnMore": "Daha ətraflı",
   "less": "Daha az",
+  "lessonName": "Lesson Name",
+  "lessonNumbered": "Lesson {lessonNumber}: {lessonName}",
   "levelIncompleteError": "Siz bütün lazım olan bloklardan istifadə edirsiniz amma səhv formada.",
+  "levelN": "LEVEL {levelNumber}",
   "listVariable": "siyahı",
   "loading": "Yüklənir...",
   "locked": "Kilidli",
@@ -246,6 +250,7 @@
   "positionTopOutRight": "sağ üst istiqamətə",
   "positionTopRight": "sağ üst istiqamətə",
   "predictionInstructions": "Make a prediction before you run the program.",
+  "projectTypeAlgebra": "Algebra",
   "projectTypeApplab": "Proqram Labı",
   "projectTypeArtist": "Rəssam",
   "projectTypeGamelab": "Game Lab",
@@ -299,7 +304,7 @@
   "submitYourProjectConfirm": "Layihənizi göndərdikdən sonra ona düzəliş edə bilməzsiniz, əminsiniz?",
   "teacherPanel": "Müəllim Paneli",
   "tryNow": "Try Now",
-  "unsubmit": "Unsubmit",
+  "unsubmit": "Abunə olmamaq",
   "unsubmitYourProject": "Layihənizi geri çağırın",
   "unsubmitYourProjectConfirm": "Layihənizi geri çağırmağınız göndərmə tarixini sıfırlayacaq, əminsiniz?",
   "showAnswers": "Cavabları göstər",
@@ -333,10 +338,5 @@
   "whenRun": "icra etdikdə",
   "workspaceHeaderShort": "iş sahəsi: ",
   "yes": "Bəli",
-  "documentation": "Documentation",
-  "lessonName": "Lesson Name",
-  "lessonNumbered": "Lesson {lessonNumber}: {lessonName}",
-  "levelN": "LEVEL {levelNumber}",
-  "projectTypeAlgebra": "Algebra",
   "yourProgress": "Your Progress"
 }