standardized lang

yetanalytics · Nov 14, 2024 · 3cd5912 · 3cd5912
1 parent 3167a58
commit 3cd5912
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/src/transformer/events/core/badge_awarded.php b/src/transformer/events/core/badge_awarded.php
@@ -44,10 +44,15 @@ function badge_awarded(array $config, \stdClass $event) {
 
     $recipient = $repo->read_record_by_id('user', $event->relateduserid);
     $actor = utils\get_user($config, $recipient);
+
     $badge = $repo->read_record_by_id('badge', $event->objectid);
-    $lang = $badge->language ?? 'en';
     $course = $badge->courseid ? $repo->read_record_by_id('course', $badge->courseid) : null;
 
+    $lang = $badge->language ??
+      ((!(is_null($course))) ?
+       utils\get_course_lang($course) :
+       $config['source_lang']);
+
     $other = unserialize($event->other);
     $issuedid = $other['badgeissuedid'];
 

diff --git a/src/transformer/events/core/badge_revoked.php b/src/transformer/events/core/badge_revoked.php
@@ -40,7 +40,11 @@ function badge_revoked(array $config, \stdClass $event) {
     $badge = $repo->read_record_by_id('badge', $event->objectid);
     $revoker = utils\get_user($config, $repo->read_record_by_id('user', $event->userid));
     $course = $badge->courseid ? $repo->read_record_by_id('course', $badge->courseid) : null;
-    $lang = $badge->language ?? 'en';
+
+    $lang = $badge->language ??
+      ((!(is_null($course))) ?
+       utils\get_course_lang($course) :
+       $config['source_lang']);
 
     $statement = [[
         'actor' => utils\get_user($config, $recipient),

diff --git a/src/transformer/events/core/badge_viewed.php b/src/transformer/events/core/badge_viewed.php
@@ -45,7 +45,11 @@ function badge_viewed(array $config, \stdClass $event) {
     $course = (isset($event->courseid) && $event->courseid != 0)
         ? $repo->read_record_by_id('course', $event->courseid)
         : null;
-    $lang = is_null($course) ? $config['source_lang'] : utils\get_course_lang($course);
+
+    $lang = $badge->language ??
+      ((!(is_null($course))) ?
+       utils\get_course_lang($course) :
+       $config['source_lang']);
 
     $statement = [
         'actor' => utils\get_user($config,$user),