Merge pull request #22944 from code-dot-org/dtl_candidate_b996df47

DTL (Test > Levelbuilder): b996df4 after manually resolving conflicts in csp/csd scripts

Gemfile

@@ -205,7 +205,7 @@ gem 'twilio-ruby' # SMS API for send-to-phone feature
 
 # We also serve a copy of one of these font files from the public directory
 gem 'font-awesome-rails', '~> 4.6.3' # NOTE: apps/src/applab/Exporter.js depends on the font file names from this version!
-gem 'sequel', '~> 4.30'
+gem 'sequel'
 gem 'user_agent_parser'
 
 gem 'paranoia'

Gemfile.lock

@@ -675,7 +675,7 @@ GEM
     selenium-webdriver (3.8.0)
       childprocess (~> 0.5)
       rubyzip (~> 1.0)
-    sequel (4.45.0)
+    sequel (5.9.0)
     sexp_processor (4.10.1)
     shotgun (0.9.1)
       rack (>= 1.0)
@@ -906,7 +906,7 @@ DEPENDENCIES
   sdoc
   seamless_database_pool!
   selenium-webdriver (= 3.8.0)
-  sequel (~> 4.30)
+  sequel
   shotgun
   simplecov (~> 0.9)
   sinatra (~> 2.0.0.beta2)

apps/i18n/common/ar_sa.json

@@ -1,5 +1,5 @@
 {
-  "achievements": "Achievements",
+  "achievements": "الانجازات",
   "activity": "نشاط",
   "actions": "الإجراءات",
   "add": "أضف",
@@ -1062,6 +1062,7 @@
   "studentControl": "النحكم الفردى للطالب",
   "studentLockStateInstructions": "استخدم الجدول بالأسفل لتتحكم بالحالة لكل طالب فردياً.",
   "studentName": "اسم التلميذ",
+  "studentNameHeader": "Student name",
   "studentAnswer": "Student answer",
   "submissionTimestamp": "Submission timestamp",
   "submit": "تسجيل",

apps/i18n/common/az_az.json

@@ -1062,6 +1062,7 @@
   "studentControl": "Fərdi tələbə kontrolu",
   "studentLockStateInstructions": "Hər bir şagirdin vəziyyətini yoxlamaq üçün aşağıdakı cədvəli istifadə edin.",
   "studentName": "Şagirdin adı",
+  "studentNameHeader": "Student name",
   "studentAnswer": "Student answer",
   "submissionTimestamp": "Submission timestamp",
   "submit": "Göndər",

apps/i18n/common/bg_bg.json

@@ -1062,6 +1062,7 @@
   "studentControl": "Контрол на ученика",
   "studentLockStateInstructions": "Използвайте таблицата по-долу, за да контролирате състоянието на всеки отделен ученик.",
   "studentName": "Име на ученика",
+  "studentNameHeader": "Student name",
   "studentAnswer": "Student answer",
   "submissionTimestamp": "Подаване на дата и час",
   "submit": "Изпрати",

apps/i18n/common/bn_bd.json

@@ -1062,6 +1062,7 @@
   "studentControl": "স্বতন্ত্র ছাত্র নিয়ন্ত্রণ",
   "studentLockStateInstructions": "নিচের টেবিলে একে স্বতন্ত্র ছাত্র রাষ্ট্রীয় নিয়ন্ত্রণ করতে ব্যবহার করুন।.",
   "studentName": "শিক্ষার্থীর নাম",
+  "studentNameHeader": "Student name",
   "studentAnswer": "Student answer",
   "submissionTimestamp": "জমা দেওয়ার টাইমস্ট্যাম্প",
   "submit": "জমা করুন",

apps/i18n/common/bs_ba.json

@@ -1062,6 +1062,7 @@
   "studentControl": "Individual student control",
   "studentLockStateInstructions": "Use the table below to control the state for each individual student.",
   "studentName": "Ime učenika",
+  "studentNameHeader": "Student name",
   "studentAnswer": "Student answer",
   "submissionTimestamp": "Submission timestamp",
   "submit": "Potvrdi",

apps/i18n/common/ca_es.json

@@ -1062,6 +1062,7 @@
   "studentControl": "Individual student control",
   "studentLockStateInstructions": "Use the table below to control the state for each individual student.",
   "studentName": "Nom de l'alumne",
+  "studentNameHeader": "Student name",
   "studentAnswer": "Student answer",
   "submissionTimestamp": "Submission timestamp",
   "submit": "Envia",

apps/i18n/common/co_co.json

@@ -1062,6 +1062,7 @@
   "studentControl": "Individual student control",
   "studentLockStateInstructions": "Use the table below to control the state for each individual student.",
   "studentName": "Student Name",
+  "studentNameHeader": "Student name",
   "studentAnswer": "Student answer",
   "submissionTimestamp": "Submission timestamp",
   "submit": "Submit",

apps/i18n/common/cs_cz.json

@@ -1062,6 +1062,7 @@
   "studentControl": "Individuální ovládání studentů",
   "studentLockStateInstructions": "Použijte tabulku níže pro kontrolu stavu každého studenta.",
   "studentName": "Jméno studenta",
+  "studentNameHeader": "Student name",
   "studentAnswer": "Student answer",
   "submissionTimestamp": "Časové razítko odeslání",
   "submit": "Odeslat",

apps/i18n/common/da_dk.json

@@ -1062,6 +1062,7 @@
   "studentControl": "Individuel student-kontrol",
   "studentLockStateInstructions": "Brug nedenstående tabel for at kontrollere fasen for den enkelte elev.",
   "studentName": "Elevens navn",
+  "studentNameHeader": "Student name",
   "studentAnswer": "Student answer",
   "submissionTimestamp": "Indsendelsestid",
   "submit": "Indsend",

apps/i18n/common/de_de.json

@@ -1062,6 +1062,7 @@
   "studentControl": "Kontrolle je Schüler",
   "studentLockStateInstructions": "Bearbeiten sie in der untenstehenden Tabelle die Einstellungen für jeden einzelnen Schüler.",
   "studentName": "Schülername",
+  "studentNameHeader": "Student name",
   "studentAnswer": "Student answer",
   "submissionTimestamp": "Submission timestamp",
   "submit": "Absenden",

apps/i18n/common/el_gr.json

@@ -1062,6 +1062,7 @@
   "studentControl": "Έλεγχος μαθητή ξεχωριστά",
   "studentLockStateInstructions": "Χρησιμοποιήστε τον παρακάτω πίνακα για τον έλεγχο της κατάστασης για κάθε μαθητή.",
   "studentName": "Όνομα μαθητή",
+  "studentNameHeader": "Student name",
   "studentAnswer": "Student answer",
   "submissionTimestamp": "Ημενρομηνία και ώρα υποβολής",
   "submit": "Υποβολή",

apps/i18n/common/en_gb.json

@@ -1062,6 +1062,7 @@
   "studentControl": "Individual student control",
   "studentLockStateInstructions": "Use the table below to control the state for each individual student.",
   "studentName": "Student Name",
+  "studentNameHeader": "Student name",
   "studentAnswer": "Student answer",
   "submissionTimestamp": "Submission timestamp",
   "submit": "Submit",

apps/i18n/common/es_es.json

@@ -539,7 +539,7 @@
   "fromDaysAgo": "(From {number} days ago)",
   "gdprDialogHeader": "¿Está de acuerdo con el uso de un sitio web con sede en los Estados Unidos?",
   "gdprDialogDetails": "Los datos de su uso de este sitio pueden ser enviados y almacenados o procesados en los Estados Unidos.",
-  "gdprDialogSeePrivacyPolicy": "Para más detalles vea nuestra política de privacidad",
+  "gdprDialogSeePrivacyPolicy": "(Para obtener más detalles, consulte nuestra política de privacidad)",
   "gdprDialogLogout": "Cerrar sesión",
   "gdprDialogYes": "Sí",
   "gender": "Género",
@@ -1062,6 +1062,7 @@
   "studentControl": "Control individual de estudiantes",
   "studentLockStateInstructions": "Usa la tabla siguiente para controlar el estado para cada estudiante individual.",
   "studentName": "Nombre del alumno",
+  "studentNameHeader": "Student name",
   "studentAnswer": "Student answer",
   "submissionTimestamp": "Fecha de envio",
   "submit": "Enviar",

apps/i18n/common/es_mx.json

@@ -539,7 +539,7 @@
   "fromDaysAgo": "(From {number} days ago)",
   "gdprDialogHeader": "¿Acepta usar un sitio web con sede en Estados Unidos?",
   "gdprDialogDetails": "Es posible que los datos de su utilización de este sitio web se envíen y almacenen en Estados Unidos.",
-  "gdprDialogSeePrivacyPolicy": "Para más detalles vea nuestra política de privacidad",
+  "gdprDialogSeePrivacyPolicy": "(Para más información, consulte nuestra política de privacidad)",
   "gdprDialogLogout": "Cerrar sesión",
   "gdprDialogYes": "Sí",
   "gender": "Sexo",
@@ -1062,6 +1062,7 @@
   "studentControl": "Control individual de alumnos",
   "studentLockStateInstructions": "Usa la tabla siguiente para controlar el estado para cada estudiante individual.",
   "studentName": "Nombre del alumno",
+  "studentNameHeader": "Student name",
   "studentAnswer": "Student answer",
   "submissionTimestamp": "Marca de tiempo del envío",
   "submit": "Enviar",

apps/i18n/common/et_ee.json

@@ -1062,6 +1062,7 @@
   "studentControl": "Iga üksiku õpilase kontroll",
   "studentLockStateInstructions": "Kontrolli alltoodud tabeli abil iga üksiku õpilase seisu.",
   "studentName": "Õpilase nimi",
+  "studentNameHeader": "Student name",
   "studentAnswer": "Student answer",
   "submissionTimestamp": "Submission timestamp",
   "submit": "Esita",

apps/i18n/common/eu_es.json

@@ -1062,6 +1062,7 @@
   "studentControl": "Ikasleen banakako kontrola",
   "studentLockStateInstructions": "Erabili beheko taula ikasle bakoitzaren egoera kontrolatzeko.",
   "studentName": "Ikaslearen izena",
+  "studentNameHeader": "Student name",
   "studentAnswer": "Student answer",
   "submissionTimestamp": "Submission timestamp",
   "submit": "Bidali",

apps/i18n/common/fa_af.json

@@ -1062,6 +1062,7 @@
   "studentControl": "Individual student control",
   "studentLockStateInstructions": "Use the table below to control the state for each individual student.",
   "studentName": "Student Name",
+  "studentNameHeader": "Student name",
   "studentAnswer": "Student answer",
   "submissionTimestamp": "Submission timestamp",
   "submit": "ارسال کنید",

apps/i18n/common/fa_ir.json

@@ -1062,6 +1062,7 @@
   "studentControl": "کنترل فردی دانش آموز",
   "studentLockStateInstructions": "از جدول زیر برای کنترل وضع فردی هر دانش آموز استفاده کنید.",
   "studentName": "نام دانش آموز",
+  "studentNameHeader": "Student name",
   "studentAnswer": "Student answer",
   "submissionTimestamp": "Submission timestamp",
   "submit": "ارسال کنید",

apps/i18n/common/fi_fi.json

@@ -1062,6 +1062,7 @@
   "studentControl": "Yksittäisen oppilaan ohjaus",
   "studentLockStateInstructions": "Käytä alla olevaa taulukkoa valvoaksesi jokaisen oppilaan vaihetta.",
   "studentName": "Opiskelijan nimi",
+  "studentNameHeader": "Student name",
   "studentAnswer": "Student answer",
   "submissionTimestamp": "Submission timestamp",
   "submit": "Jatka",

apps/i18n/common/fil_ph.json

@@ -1062,6 +1062,7 @@
   "studentControl": "Indibidwal na kontrol ng estudyante",
   "studentLockStateInstructions": "Gamitin ang talahanayan sa baba para kontrolin ang estado ng bawat indibidwal na estudyante.",
   "studentName": "Pangalan ng Estudyante",
+  "studentNameHeader": "Student name",
   "studentAnswer": "Student answer",
   "submissionTimestamp": "Timestamp ng Pagsusumite",
   "submit": "Ipasa",

apps/i18n/common/fr_fr.json

@@ -538,7 +538,7 @@
   "forTeachersOnly": "Pour les enseignants uniquement",
   "fromDaysAgo": "(From {number} days ago)",
   "gdprDialogHeader": "Acceptez-vous d’utiliser un site Web basé aux États-Unis?",
-  "gdprDialogDetails": "Vos données de connexion sur ce site peuvent être envoyées et stockées ou traitées aux Etats-Unis.",
+  "gdprDialogDetails": "Des informations sur votre utilisation de ce site peuvent être envoyées et enregistrées ou traitées aux États-Unis.",
   "gdprDialogSeePrivacyPolicy": "(Pour plus d’informations, consultez notre politique de confidentialité)",
   "gdprDialogLogout": "Fermer la session",
   "gdprDialogYes": "Oui",
@@ -1062,6 +1062,7 @@
   "studentControl": "Contrôle individuel de l'élève",
   "studentLockStateInstructions": "Utiliser le tableau ci-dessous pour contrôler l'état de chaque élève.",
   "studentName": "Nom de l'élève",
+  "studentNameHeader": "Student name",
   "studentAnswer": "Student answer",
   "submissionTimestamp": "Date et heure de l'envoi",
   "submit": "Envoyer",

apps/i18n/common/ga_ie.json

@@ -1062,6 +1062,7 @@
   "studentControl": "Rialú dalta ar dhalta",
   "studentLockStateInstructions": "Úsáid an tábla thíos chun socruithe éagsúla a dhéanamh i gcomhair daltaí éagsúla.",
   "studentName": "Ainm an Dalta",
+  "studentNameHeader": "Student name",
   "studentAnswer": "Student answer",
   "submissionTimestamp": "Stampa ama na hiarrachta",
   "submit": "Seol",

apps/i18n/common/gl_es.json

@@ -1062,6 +1062,7 @@
   "studentControl": "Individual student control",
   "studentLockStateInstructions": "Use the table below to control the state for each individual student.",
   "studentName": "Nome do estudante",
+  "studentNameHeader": "Student name",
   "studentAnswer": "Student answer",
   "submissionTimestamp": "Submission timestamp",
   "submit": "Enviar",

apps/i18n/common/haw_hi.json

@@ -1062,6 +1062,7 @@
   "studentControl": "Individual student control",
   "studentLockStateInstructions": "Use the table below to control the state for each individual student.",
   "studentName": "Student Name",
+  "studentNameHeader": "Student name",
   "studentAnswer": "Student answer",
   "submissionTimestamp": "Submission timestamp",
   "submit": "Submit",

apps/i18n/common/he_il.json

@@ -1062,6 +1062,7 @@
   "studentControl": "Individual student control",
   "studentLockStateInstructions": "Use the table below to control the state for each individual student.",
   "studentName": "שם תלמיד",
+  "studentNameHeader": "Student name",
   "studentAnswer": "Student answer",
   "submissionTimestamp": "Submission timestamp",
   "submit": "שלח",

apps/i18n/common/hi_in.json

@@ -1062,6 +1062,7 @@
   "studentControl": "Individual student control",
   "studentLockStateInstructions": "Use the table below to control the state for each individual student.",
   "studentName": "Student Name",
+  "studentNameHeader": "Student name",
   "studentAnswer": "Student answer",
   "submissionTimestamp": "Submission timestamp",
   "submit": "सबमिट करें",

apps/i18n/common/hr_hr.json

@@ -1062,6 +1062,7 @@
   "studentControl": "Individual student control",
   "studentLockStateInstructions": "Use the table below to control the state for each individual student.",
   "studentName": "Ime učenika",
+  "studentNameHeader": "Student name",
   "studentAnswer": "Student answer",
   "submissionTimestamp": "Submission timestamp",
   "submit": "Pošalji",

apps/i18n/common/hu_hu.json

@@ -1062,6 +1062,7 @@
   "studentControl": "Egyedi tanulóellenőrzés",
   "studentLockStateInstructions": "Használd az alábbi táblát, hogy minden egyes diák állapotát ellenőrizd.",
   "studentName": "Diák neve",
+  "studentNameHeader": "Student name",
   "studentAnswer": "Student answer",
   "submissionTimestamp": "Submission timestamp",
   "submit": "Elküldés",

apps/i18n/common/hy_am.json

@@ -1062,6 +1062,7 @@
   "studentControl": "Individual student control",
   "studentLockStateInstructions": "Use the table below to control the state for each individual student.",
   "studentName": "Student Name",
+  "studentNameHeader": "Student name",
   "studentAnswer": "Student answer",
   "submissionTimestamp": "Submission timestamp",
   "submit": "Հաստատել",

apps/i18n/common/id_id.json

@@ -1062,6 +1062,7 @@
   "studentControl": "Kontrol setiap siswa",
   "studentLockStateInstructions": "Gunakan tabel di bawah ini untuk mengatur negara untuk setiap siswa.",
   "studentName": "Nama siswa",
+  "studentNameHeader": "Student name",
   "studentAnswer": "Student answer",
   "submissionTimestamp": "Pengiriman stempel waktu",
   "submit": "Kirim",

apps/i18n/common/is_is.json

@@ -1062,6 +1062,7 @@
   "studentControl": "Stjórnun einstakra nemenda",
   "studentLockStateInstructions": "Notaðu töfluna hér fyrir neðan til að stjórna stöðu einstakra nemenda.",
   "studentName": "Nafn nemanda",
+  "studentNameHeader": "Student name",
   "studentAnswer": "Student answer",
   "submissionTimestamp": "Tímastimpill skila",
   "submit": "Senda inn",