Merge remote-tracking branch 'origin/master'

chamilo · Apr 28, 2024 · 6ab3467 · 6ab3467
2 parents 2cccd8d + 1e38d1e
commit 6ab3467
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 5 deletions.
diff --git a/assets/vue/components/social/UserProfileCard.vue b/assets/vue/components/social/UserProfileCard.vue
@@ -18,7 +18,7 @@
           <i :class="`mdi mdi-flag-${languageInfo.code.toLowerCase()}`"></i>
         </template>
         <template v-else>
-          {{ languageInfo.code }}
+          {{ t(languageInfo.code) }}
         </template>
       </div>
 
@@ -72,8 +72,8 @@
             :key="item.variable"
           >
             <div v-if="item.value">
-              <dt v-if="item.variable !== 'langue_cible'">{{ item.label }}:</dt>
-              <dd v-if="item.variable !== 'langue_cible'">{{ item.value }}</dd>
+              <dt v-if="item.variable !== 'langue_cible'">{{ t(item.label) }}:</dt>
+              <dd v-if="item.variable !== 'langue_cible'">{{ t(item.value) }}</dd>
 
               <div
                 v-if="item.variable === 'langue_cible'"

diff --git a/public/main/admin/user_information.php b/public/main/admin/user_information.php
@@ -405,7 +405,7 @@
         $sessionInformation .= $courseToolInformationTotal;
     }
 } else {
-    $sessionInformation = '<p>'.get_lang('NoCourse sessionsForThisUser').'</p>';
+    $sessionInformation = '<p>'.get_lang('No course sessions for this user').'</p>';
 }
 $courseToolInformationTotal = '';
 

diff --git a/public/main/exercise/result.php b/public/main/exercise/result.php
@@ -25,6 +25,10 @@
 
 $cid = isset($_REQUEST['cid']) ? (int) $_REQUEST['cid'] : null;
 $sid = isset($_REQUEST['sid']) ? (int) $_REQUEST['sid'] : null;
+// Hack for sid not being picked up by CidReqListener (cid isn't either)
+if (!empty($sid)) {
+    Session::write('sid', $sid);
+}
 
 // A notice for unauthorized people.
 api_protect_course_script($show_headers, false, '', $cid);
@@ -47,7 +51,8 @@
 $student_id = (int) $track_exercise_info['exe_user_id'];
 $current_user_id = api_get_user_id();
 
-$objExercise = new Exercise();
+// Pass cid manually to avoid context issues with cid not being picked up by CidReqListener
+$objExercise = new Exercise($cid);
 if (!empty($exercise_id)) {
     $objExercise->read($exercise_id);
 }

diff --git a/translations/messages.de.po b/translations/messages.de.po
@@ -25136,3 +25136,6 @@ msgstr "hat folgende Kompetenzen erworben"
 
 msgid "Certificate Footer"
 msgstr ""
+
+msgid "No course session for this user"
+msgstr "Keine Sessions für diesen Benutzer"
diff --git a/translations/messages.fr.po b/translations/messages.fr.po
@@ -29213,3 +29213,6 @@ msgstr "a obtenu les compétences suivantes "
 
 msgid "Certificate Footer"
 msgstr ""
+
+msgid "No course session for this user"
+msgstr "Pas de cours de session pour cet utilisateur"
diff --git a/translations/messages.pot b/translations/messages.pot
@@ -27515,3 +27515,6 @@ msgstr ""
 
 msgid "Select date .."
 msgstr ""
+
+msgid "No course sessions for this user"
+msgstr ""