From b3c191e5150d4849f2d1bee9adebdd9cfaa1f18c Mon Sep 17 00:00:00 2001 From: Angel Fernando Quiroz Campos <1697880+AngelFQC@users.noreply.github.com> Date: Thu, 30 Jan 2025 17:08:30 -0500 Subject: [PATCH] Internal: Admin: Fix languages for courses created with data filler --- tests/datafiller/data_courses.php | 22 +++++++++++----------- tests/datafiller/fill_courses.php | 9 ++++++--- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/tests/datafiller/data_courses.php b/tests/datafiller/data_courses.php index dd13191c9f..c96c8de06d 100755 --- a/tests/datafiller/data_courses.php +++ b/tests/datafiller/data_courses.php @@ -17,7 +17,7 @@ $courses[] = [ 'title' => 'English for beginners', 'description' => 'English course', 'category_code' => 'LANG', - 'course_language' => 'english', + 'course_language' => 'en_US', 'user_id' => 1, 'expiration_date' => '2020-09-01 00:00:00', 'exemplary_content' => true, @@ -28,7 +28,7 @@ $courses[] = [ 'title' => 'Español para iniciantes', 'description' => 'Curso de español', 'category_code' => 'LANG', - 'course_language' => 'spanish', + 'course_language' => 'es', 'user_id' => 1, 'expiration_date' => '2020-09-01 00:00:00', 'exemplary_content' => true, @@ -39,7 +39,7 @@ $courses[] = [ 'title' => 'Français pour débutants', 'description' => 'Cours de français', 'category_code' => 'LANG', - 'course_language' => 'french', + 'course_language' => 'fr_FR', 'user_id' => 1, 'expiration_date' => '2020-09-01 00:00:00', 'exemplary_content' => true, @@ -50,7 +50,7 @@ $courses[] = [ 'title' => 'History of litterature', 'description' => 'History of English litterature from the Middle Ages to our times', 'category_code' => 'PROJ', - 'course_language' => 'english', + 'course_language' => 'en_US', 'user_id' => 1, 'expiration_date' => '2020-09-01 00:00:00', 'exemplary_content' => true, @@ -61,7 +61,7 @@ $courses[] = [ 'title' => 'Our solar system', 'description' => 'Introduction to our solar system and the interactions between planets', 'category_code' => 'PROJ', - 'course_language' => 'english', + 'course_language' => 'en_US', 'user_id' => 1, 'expiration_date' => '2020-09-01 00:00:00', 'exemplary_content' => true, @@ -72,7 +72,7 @@ $courses[] = [ 'title' => 'Maritime Navigation', 'description' => 'Preparation course for the International Maritime Navigation exam', 'category_code' => 'PROJ', - 'course_language' => 'english', + 'course_language' => 'en_US', 'user_id' => 1, 'expiration_date' => '2020-09-01 00:00:00', 'exemplary_content' => true, @@ -83,7 +83,7 @@ $courses[] = [ 'title' => 'National Geography', 'description' => 'Introduction to geography at a national level', 'category_code' => 'PROJ', - 'course_language' => 'english', + 'course_language' => 'en_US', 'user_id' => 1, 'expiration_date' => '2020-09-01 00:00:00', 'exemplary_content' => true, @@ -94,7 +94,7 @@ $courses[] = [ 'title' => '日本語', 'description' => 'Japanese course for beginners', 'category_code' => 'LANG', - 'course_language' => 'japanese', + 'course_language' => 'ja', 'user_id' => 1, 'expiration_date' => '2020-09-01 00:00:00', 'exemplary_content' => true, @@ -105,7 +105,7 @@ $courses[] = [ 'title' => 'Time management', 'description' => 'Learn to manage your time efficiently', 'category_code' => 'PROJ', - 'course_language' => 'english', + 'course_language' => 'en_US', 'user_id' => 1, 'expiration_date' => '2020-09-01 00:00:00', 'exemplary_content' => true, @@ -116,7 +116,7 @@ $courses[] = [ 'title' => 'SCRUM project management basics', 'description' => 'Introduction to SCRUM project management for busy people', 'category_code' => 'PROJ', - 'course_language' => 'english', + 'course_language' => 'en_US', 'user_id' => 1, 'expiration_date' => '2020-09-01 00:00:00', 'exemplary_content' => true, @@ -127,7 +127,7 @@ $courses[] = [ 'title' => 'Day to day mathematics', 'description' => 'Mathematics for busy people', 'category_code' => 'PROJ', - 'course_language' => 'english', + 'course_language' => 'en_US', 'user_id' => 1, 'expiration_date' => '2020-09-01 00:00:00', 'exemplary_content' => true, diff --git a/tests/datafiller/fill_courses.php b/tests/datafiller/fill_courses.php index 57f8afa194..dcc988ba71 100755 --- a/tests/datafiller/fill_courses.php +++ b/tests/datafiller/fill_courses.php @@ -19,7 +19,10 @@ function fill_courses() require_once 'data_courses.php'; // fill the $courses array $output = array(); $output[] = array('title'=>'Courses Filling Report: '); - $languages = SubLanguageManager::getAllLanguages(true); + $languages = array_column( + SubLanguageManager::getAllLanguages(true), + 'isocode' + ); $i = 1; foreach ($courses as $i => $course) { // First check that the first item doesn't exist already @@ -27,8 +30,8 @@ function fill_courses() // The wanted code is necessary to avoid interpretation $course['wanted_code'] = $course['code']; // Make sure the language defaults to English if others are disabled - if (!isset($languages[$course['course_language']])) { - $course['course_language'] = 'english'; + if (!in_array($course['course_language'], $languages)) { + $course['course_language'] = 'en_US'; } // Effectively create the course $res = CourseManager::create_course($course);