Merge branch 'main' into pre-commit-ci-update-config

hedy.py

@@ -3569,16 +3569,18 @@ def determine_roles(lookup, input_string, level, lang):
         assignments = [x for x in lookup if x.name == var]
 
         if (assignments[0].tree.data == 'for_list'):
-            roles_dictionary[var] = 'walker'
+            roles_dictionary[var] = gettext('walker_variable_role')
+        elif (assignments[0].tree.data == 'for_loop'):
+            roles_dictionary[var] = gettext('stepper_variable_role')
         elif (assignments[0].type_ == 'list'):
-            roles_dictionary[var] = 'container'
+            roles_dictionary[var] = gettext('list_variable_role')
         elif (len(assignments) == 1):
             if (assignments[0].type_ == 'input'):
-                roles_dictionary[var] = 'input constant'
+                roles_dictionary[var] = gettext('input_variable_role')
             else:
-                roles_dictionary[var] = 'constant'
+                roles_dictionary[var] = gettext('constant_variable_role')
         else:
-            roles_dictionary[var] = 'unknown'
+            roles_dictionary[var] = gettext('unknown_variable_role')
 
     return roles_dictionary
 

messages.pot

@@ -395,6 +395,9 @@ msgstr ""
 msgid "connect_guest_teacher"
 msgstr ""
 
+msgid "constant_variable_role"
+msgstr ""
+
 msgid "content_invalid"
 msgstr ""
 
@@ -815,6 +818,9 @@ msgstr ""
 msgid "input"
 msgstr ""
 
+msgid "input_variable_role"
+msgstr ""
+
 msgid "integer"
 msgstr ""
 
@@ -938,6 +944,9 @@ msgstr ""
 msgid "list"
 msgstr ""
 
+msgid "list_variable_role"
+msgstr ""
+
 msgid "live_dashboard"
 msgstr ""
 
@@ -1592,6 +1601,9 @@ msgstr ""
 msgid "step_title"
 msgstr ""
 
+msgid "stepper_variable_role"
+msgstr ""
+
 msgid "stop_code_button"
 msgstr ""
 
@@ -1829,6 +1841,9 @@ msgstr ""
 msgid "unique_usernames"
 msgstr ""
 
+msgid "unknown_variable_role"
+msgstr ""
+
 msgid "unlock_thresholds"
 msgstr ""
 
@@ -1904,6 +1919,9 @@ msgstr ""
 msgid "view_slides"
 msgstr ""
 
+msgid "walker_variable_role"
+msgstr ""
+
 msgid "welcome"
 msgstr ""
 

static/js/admin.ts

@@ -27,11 +27,11 @@ export function initializeAdminUserPage(_options: InitializeAdminUsersPageOption
       }
   });
 
-  $('.admin-pagination-btn').click(function(ev) {
+  $('.admin_pagination_btn').click(function(ev) {
       // Copy the token into the hidden input field, then submit the form
       var token = $(ev.target).data('page_token');
       console.log(token);
-      $('#hidden-page-input').attr('value', token);
+      $('#hidden_page_input').attr('value', token);
       $('#filterform').submit();
   });
 }

static/js/adventure.ts

@@ -19,7 +19,7 @@ let $editor: ClassicEditor;
 let keywordHasAlert: Map<string, boolean> = new Map()
 
 export async function initializeCustomAdventurePage(_options: InitializeCustomizeAdventurePage) {
-    const editorContainer = document.querySelector('#adventure-editor') as HTMLElement;
+    const editorContainer = document.querySelector('#adventure_editor') as HTMLElement;
     // Initialize the editor with the default language
     let lang =  document.querySelector('#languages_dropdown> .option.selected')!.getAttribute('data-value') as string
     const TRADUCTIONS = convert(TRADUCTION_IMPORT) as Map<string, Map<string,string>>;