From 6ee8cf23a2914e5a130c73201af9b5ff7200d406 Mon Sep 17 00:00:00 2001 From: eemaanamir Date: Wed, 22 Jan 2025 23:18:45 +0500 Subject: [PATCH 1/3] chore: added language to ace message sent event --- lms/djangoapps/bulk_email/signals.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lms/djangoapps/bulk_email/signals.py b/lms/djangoapps/bulk_email/signals.py index 8ada8760cdcf..5d0e2e517387 100644 --- a/lms/djangoapps/bulk_email/signals.py +++ b/lms/djangoapps/bulk_email/signals.py @@ -44,6 +44,8 @@ def ace_email_sent_handler(sender, **kwargs): user_id = recipient.get('user_id', None) channel = message.get('channel', None) course_id = context.get('course_id', None) + message_language = message.get('message_language', None), + translation_language = message.get('translation_language', None) if not course_id: course_email = context.get('course_email', None) course_id = course_email.course_id if course_email else None @@ -56,5 +58,7 @@ def ace_email_sent_handler(sender, **kwargs): 'course_id': course_id, 'user_id': user_id, 'user_email': email_address, + 'message_language': message_language, + 'translation_language': translation_language, } ) From b33ae24ab6b3a4278fcc5ba9d3ec4c962d25912a Mon Sep 17 00:00:00 2001 From: eemaanamir Date: Thu, 23 Jan 2025 14:53:19 +0500 Subject: [PATCH 2/3] fix: fixed lint errors --- lms/djangoapps/bulk_email/signals.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lms/djangoapps/bulk_email/signals.py b/lms/djangoapps/bulk_email/signals.py index 5d0e2e517387..7402dca75482 100644 --- a/lms/djangoapps/bulk_email/signals.py +++ b/lms/djangoapps/bulk_email/signals.py @@ -44,7 +44,7 @@ def ace_email_sent_handler(sender, **kwargs): user_id = recipient.get('user_id', None) channel = message.get('channel', None) course_id = context.get('course_id', None) - message_language = message.get('message_language', None), + message_language = message.get('message_language', None) translation_language = message.get('translation_language', None) if not course_id: course_email = context.get('course_email', None) From bb091cff9bb685dd07ac47498724032bf96644a3 Mon Sep 17 00:00:00 2001 From: eemaanamir Date: Fri, 24 Jan 2025 23:10:57 +0500 Subject: [PATCH 3/3] chore: updated ace version --- requirements/edx/base.txt | 2 +- requirements/edx/development.txt | 2 +- requirements/edx/doc.txt | 2 +- requirements/edx/testing.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 66428919cc61..a16a1cd40a75 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -401,7 +401,7 @@ drf-yasg==1.21.8 # via # django-user-tasks # edx-api-doc-tools -edx-ace==1.11.3 +edx-ace==1.11.4 # via -r requirements/edx/kernel.in edx-api-doc-tools==2.0.0 # via diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index faab27d2a6ba..184d39fee56d 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -661,7 +661,7 @@ drf-yasg==1.21.8 # -r requirements/edx/testing.txt # django-user-tasks # edx-api-doc-tools -edx-ace==1.11.3 +edx-ace==1.11.4 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index 0f927c5218f8..4260b7444dd4 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -486,7 +486,7 @@ drf-yasg==1.21.8 # -r requirements/edx/base.txt # django-user-tasks # edx-api-doc-tools -edx-ace==1.11.3 +edx-ace==1.11.4 # via -r requirements/edx/base.txt edx-api-doc-tools==2.0.0 # via diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 5c991ae3e7d6..c495becb1a65 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -508,7 +508,7 @@ drf-yasg==1.21.8 # -r requirements/edx/base.txt # django-user-tasks # edx-api-doc-tools -edx-ace==1.11.3 +edx-ace==1.11.4 # via -r requirements/edx/base.txt edx-api-doc-tools==2.0.0 # via