Merge branch 'master' into umar/remove-old-boto

openedx · Nov 29, 2022 · 49a9fbd · 49a9fbd
2 parents 1ad90c2 + 1a869ec
commit 49a9fbd
Show file tree

Hide file tree

Showing 58 changed files with 248 additions and 96 deletions.
diff --git a/Makefile b/Makefile
@@ -174,3 +174,10 @@ docker_push: docker_tag docker_auth ## push to docker hub
 	docker push "openedx/cms:${GITHUB_SHA}"
 	docker push "openedx/cms-dev:latest"
 	docker push "openedx/cms-dev:${GITHUB_SHA}"
+
+# WARNING (EXPERIMENTAL):
+# This installs the Ubuntu requirements necessary to make `pip install` and some other basic
+# dev commands to pass. This is not necessarily everything needed to get a working edx-platform.
+# Part of https://github.com/openedx/wg-developer-experience/issues/136
+ubuntu-requirements: ## Install ubuntu 22.04 system packages needed for `pip install` to work on ubuntu.
+	sudo apt install libmysqlclient-dev libxmlsec1-dev
diff --git a/cms/djangoapps/cms_user_tasks/exceptions.py b/cms/djangoapps/cms_user_tasks/exceptions.py
@@ -5,4 +5,4 @@
 
 class NoAuthHandlerFound(Exception):
     """Is raised when no auth handlers were found ready to authenticate."""
-    pass
+    pass  # lint-amnesty, pylint: disable=unnecessary-pass
diff --git a/cms/djangoapps/contentstore/signals/handlers.py b/cms/djangoapps/contentstore/signals/handlers.py
@@ -11,10 +11,10 @@
 from django.db import transaction
 from django.dispatch import receiver
 from edx_toggles.toggles import SettingToggle
-from edx_event_bus_kafka import get_producer
 from opaque_keys.edx.keys import CourseKey
 from openedx_events.content_authoring.data import CourseCatalogData, CourseScheduleData
 from openedx_events.content_authoring.signals import COURSE_CATALOG_INFO_CHANGED
+from openedx_events.event_bus import get_producer
 from pytz import UTC
 
 from cms.djangoapps.contentstore.courseware_index import (

diff --git a/cms/envs/common.py b/cms/envs/common.py
@@ -1243,6 +1243,8 @@
 ##### custom vendor plugin variables #####
 # JavaScript code can access this data using `process.env.JS_ENV_EXTRA_CONFIG`
 # One of the current use cases for this is enabling custom TinyMCE plugins
+# (TINYMCE_ADDITIONAL_PLUGINS) and overriding the TinyMCE configuration
+# (TINYMCE_CONFIG_OVERRIDES).
 JS_ENV_EXTRA_CONFIG = {}
 
 ############################### PIPELINE #######################################

diff --git a/cms/envs/devstack.py b/cms/envs/devstack.py
@@ -301,6 +301,7 @@ def should_show_debug_toolbar(request):  # lint-amnesty, pylint: disable=missing
 CREDENTIALS_PUBLIC_SERVICE_URL = 'http://localhost:18150'
 
 #################### Event bus backend ########################
+EVENT_BUS_PRODUCER = 'edx_event_bus_kafka.create_producer'
 EVENT_BUS_KAFKA_SCHEMA_REGISTRY_URL = 'http://edx.devstack.schema-registry:8081'
 EVENT_BUS_KAFKA_BOOTSTRAP_SERVERS = 'edx.devstack.kafka:29092'
 EVENT_BUS_TOPIC_PREFIX = 'dev'

diff --git a/common/djangoapps/student/models.py b/common/djangoapps/student/models.py
@@ -1602,6 +1602,7 @@ def emit_event(self, event_name, enterprise_uuid=None):
                     send_course_enrollment_email.apply_async((self.user.id, str(self.course_id),
                                                               self.course_overview.display_name,
                                                               self.course_overview.short_description,
+                                                              self.course_overview.has_ended(),
                                                               course_pacing_type))
                 segment_properties['email'] = self.user.email
                 # This next property is for an experiment, see method's comments for more information

diff --git a/common/djangoapps/student/tasks.py b/common/djangoapps/student/tasks.py
@@ -31,7 +31,7 @@
 
 @shared_task(bind=True, ignore_result=True)
 def send_course_enrollment_email(
-    self, user_id, course_id, course_title, short_description, pacing_type
+    self, user_id, course_id, course_title, short_description, course_ended, pacing_type
 ):
     """
     Send course enrollment email using Braze API.
@@ -74,7 +74,8 @@ def send_course_enrollment_email(
     try:
         user = User.objects.get(id=user_id)
         course_key = CourseKey.from_string(course_id)
-        course_date_blocks = get_course_dates_for_email(user, course_key, request=None)
+        if not course_ended:
+            course_date_blocks = get_course_dates_for_email(user, course_key, request=None)
     except Exception:  # pylint: disable=broad-except
         is_course_date_missing = True
 

diff --git a/common/djangoapps/student/tests/test_tasks.py b/common/djangoapps/student/tests/test_tasks.py
@@ -37,6 +37,7 @@ def setUp(self):
             "course_id": str(self.course.id),
             "course_title": "Test course",
             "short_description": "Short description of course",
+            "course_ended": False,
             "pacing_type": "self-paced",
         }
 

diff --git a/conf/locale/ar/LC_MESSAGES/django.po b/conf/locale/ar/LC_MESSAGES/django.po
@@ -8518,7 +8518,6 @@ msgstr ""
 "{platform_name} حتى الآن، فانقر فوق {register_label_strong} في أعلى الصفحة."
 
 #: openedx/core/djangoapps/user_authn/views/login.py
-#: lms/templates/header/navbar-not-authenticated.html
 #: lms/templates/navigation/navbar-not-authenticated.html
 #: themes/stanford-style/lms/templates/register-form.html
 msgid "Register"
@@ -18097,6 +18096,10 @@ msgstr "كيفية العمل"
 msgid "Schools"
 msgstr "المدارس"
 
+#: lms/templates/header/navbar-not-authenticated.html
+msgid "Register for free"
+msgstr ""
+
 #: lms/templates/header/user_dropdown.html
 msgid "Resume your last course"
 msgstr "استئناف مساقك الأخير"

diff --git a/conf/locale/ca/LC_MESSAGES/django.po b/conf/locale/ca/LC_MESSAGES/django.po
@@ -7602,7 +7602,6 @@ msgid ""
 " yet, click {register_label_strong} at the top of the page."
 msgstr ""
 
-#: lms/templates/header/navbar-not-authenticated.html
 #: lms/templates/navigation/navbar-not-authenticated.html
 #: themes/stanford-style/lms/templates/register-form.html
 msgid "Register"
@@ -16725,6 +16724,10 @@ msgstr "Com funciona"
 msgid "Schools"
 msgstr "Escoles"
 
+#: lms/templates/header/navbar-not-authenticated.html
+msgid "Register for free"
+msgstr ""
+
 #: lms/templates/header/user_dropdown.html
 msgid "Resume your last course"
 msgstr "Reprèn el darrer curs"

diff --git a/conf/locale/de_DE/LC_MESSAGES/django.po b/conf/locale/de_DE/LC_MESSAGES/django.po
@@ -8497,7 +8497,6 @@ msgid ""
 " yet, click {register_label_strong} at the top of the page."
 msgstr ""
 
-#: lms/templates/header/navbar-not-authenticated.html
 #: lms/templates/navigation/navbar-not-authenticated.html
 #: themes/stanford-style/lms/templates/register-form.html
 msgid "Register"
@@ -18410,6 +18409,10 @@ msgstr "Wie es funktioniert"
 msgid "Schools"
 msgstr "Schulen"
 
+#: lms/templates/header/navbar-not-authenticated.html
+msgid "Register for free"
+msgstr ""
+
 #: lms/templates/header/user_dropdown.html
 msgid "Resume your last course"
 msgstr "Letzten Kurs fortsetzen"

diff --git a/conf/locale/el/LC_MESSAGES/django.po b/conf/locale/el/LC_MESSAGES/django.po
@@ -7779,7 +7779,6 @@ msgid ""
 msgstr ""
 
 #: openedx/core/djangoapps/user_authn/views/login.py
-#: lms/templates/header/navbar-not-authenticated.html
 #: lms/templates/navigation/navbar-not-authenticated.html
 #: themes/stanford-style/lms/templates/register-form.html
 msgid "Register"
@@ -16410,6 +16409,10 @@ msgstr ""
 msgid "Schools"
 msgstr ""
 
+#: lms/templates/header/navbar-not-authenticated.html
+msgid "Register for free"
+msgstr ""
+
 #: lms/templates/header/user_dropdown.html
 msgid "Resume your last course"
 msgstr ""

diff --git a/conf/locale/en/LC_MESSAGES/django.po b/conf/locale/en/LC_MESSAGES/django.po
@@ -38,8 +38,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2022-11-13 20:34+0000\n"
-"PO-Revision-Date: 2022-11-13 20:34:30.576557\n"
+"POT-Creation-Date: 2022-11-28 19:22+0000\n"
+"PO-Revision-Date: 2022-11-28 19:22:38.266977\n"
 "Last-Translator: \n"
 "Language-Team: openedx-translation <[email protected]>\n"
 "Language: en\n"
@@ -7625,7 +7625,6 @@ msgid ""
 msgstr ""
 
 #: openedx/core/djangoapps/user_authn/views/login.py
-#: lms/templates/header/navbar-not-authenticated.html
 #: lms/templates/navigation/navbar-not-authenticated.html
 #: themes/stanford-style/lms/templates/register-form.html
 msgid "Register"
@@ -16136,6 +16135,10 @@ msgstr ""
 msgid "Schools"
 msgstr ""
 
+#: lms/templates/header/navbar-not-authenticated.html
+msgid "Register for free"
+msgstr ""
+
 #: lms/templates/header/user_dropdown.html
 msgid "Resume your last course"
 msgstr ""

diff --git a/conf/locale/en/LC_MESSAGES/djangojs.po b/conf/locale/en/LC_MESSAGES/djangojs.po
@@ -32,8 +32,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2022-11-13 20:34+0000\n"
-"PO-Revision-Date: 2022-11-13 20:34:30.398646\n"
+"POT-Creation-Date: 2022-11-28 19:22+0000\n"
+"PO-Revision-Date: 2022-11-28 19:22:38.195999\n"
 "Last-Translator: \n"
 "Language-Team: openedx-translation <[email protected]>\n"
 "Language: en\n"

diff --git a/conf/locale/eo/LC_MESSAGES/django.mo b/conf/locale/eo/LC_MESSAGES/django.mo
diff --git a/conf/locale/eo/LC_MESSAGES/django.po b/conf/locale/eo/LC_MESSAGES/django.po
@@ -38,8 +38,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2022-11-13 20:34+0000\n"
-"PO-Revision-Date: 2022-11-13 20:34:30.576557\n"
+"POT-Creation-Date: 2022-11-28 19:22+0000\n"
+"PO-Revision-Date: 2022-11-28 19:22:38.266977\n"
 "Last-Translator: \n"
 "Language-Team: openedx-translation <[email protected]>\n"
 "Language: eo\n"
@@ -9689,7 +9689,6 @@ msgstr ""
 "ιη¢ι∂ι∂υηт υт łαвσяє єт ∂σłσяє мαgηα αłιqυα. υт єηιм α∂ мιηιм νєηιαм, q#"
 
 #: openedx/core/djangoapps/user_authn/views/login.py
-#: lms/templates/header/navbar-not-authenticated.html
 #: lms/templates/navigation/navbar-not-authenticated.html
 #: themes/stanford-style/lms/templates/register-form.html
 msgid "Register"
@@ -20762,6 +20761,10 @@ msgstr "Höw ït Wörks Ⱡ'σяєм ιρѕυм ∂σłσя ѕ#"
 msgid "Schools"
 msgstr "Sçhööls Ⱡ'σяєм ιρѕυм #"
 
+#: lms/templates/header/navbar-not-authenticated.html
+msgid "Register for free"
+msgstr "Régïstér för fréé Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмє#"
+
 #: lms/templates/header/user_dropdown.html
 msgid "Resume your last course"
 msgstr "Résümé ýöür läst çöürsé Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σ#"

diff --git a/conf/locale/eo/LC_MESSAGES/djangojs.mo b/conf/locale/eo/LC_MESSAGES/djangojs.mo
diff --git a/conf/locale/eo/LC_MESSAGES/djangojs.po b/conf/locale/eo/LC_MESSAGES/djangojs.po
@@ -32,8 +32,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2022-11-13 20:34+0000\n"
-"PO-Revision-Date: 2022-11-13 20:34:30.398646\n"
+"POT-Creation-Date: 2022-11-28 19:22+0000\n"
+"PO-Revision-Date: 2022-11-28 19:22:38.195999\n"
 "Last-Translator: \n"
 "Language-Team: openedx-translation <[email protected]>\n"
 "Language: eo\n"

diff --git a/conf/locale/es_419/LC_MESSAGES/django.po b/conf/locale/es_419/LC_MESSAGES/django.po
@@ -8884,7 +8884,6 @@ msgstr ""
 "{register_label_strong} en la parte superior de la página."
 
 #: openedx/core/djangoapps/user_authn/views/login.py
-#: lms/templates/header/navbar-not-authenticated.html
 #: lms/templates/navigation/navbar-not-authenticated.html
 #: themes/stanford-style/lms/templates/register-form.html
 msgid "Register"
@@ -18837,6 +18836,10 @@ msgstr "Cómo funciona"
 msgid "Schools"
 msgstr "Instituciones"
 
+#: lms/templates/header/navbar-not-authenticated.html
+msgid "Register for free"
+msgstr ""
+
 #: lms/templates/header/user_dropdown.html
 msgid "Resume your last course"
 msgstr "Reanudar su último curso"

diff --git a/conf/locale/eu_ES/LC_MESSAGES/django.po b/conf/locale/eu_ES/LC_MESSAGES/django.po
@@ -7742,7 +7742,6 @@ msgid ""
 msgstr ""
 
 #: openedx/core/djangoapps/user_authn/views/login.py
-#: lms/templates/header/navbar-not-authenticated.html
 #: lms/templates/navigation/navbar-not-authenticated.html
 #: themes/stanford-style/lms/templates/register-form.html
 msgid "Register"
@@ -16426,6 +16425,10 @@ msgstr "Nola dabil"
 msgid "Schools"
 msgstr "Eskolak"
 
+#: lms/templates/header/navbar-not-authenticated.html
+msgid "Register for free"
+msgstr ""
+
 #: lms/templates/header/user_dropdown.html
 msgid "Resume your last course"
 msgstr ""

diff --git a/conf/locale/fr/LC_MESSAGES/django.po b/conf/locale/fr/LC_MESSAGES/django.po
@@ -8935,7 +8935,6 @@ msgstr ""
 "cliquez sur {register_label_strong} en haut de la page."
 
 #: openedx/core/djangoapps/user_authn/views/login.py
-#: lms/templates/header/navbar-not-authenticated.html
 #: lms/templates/navigation/navbar-not-authenticated.html
 #: themes/stanford-style/lms/templates/register-form.html
 msgid "Register"
@@ -18933,6 +18932,10 @@ msgstr "Comment ça marche"
 msgid "Schools"
 msgstr "Écoles"
 
+#: lms/templates/header/navbar-not-authenticated.html
+msgid "Register for free"
+msgstr ""
+
 #: lms/templates/header/user_dropdown.html
 msgid "Resume your last course"
 msgstr "Reprendre le dernier cours"

diff --git a/conf/locale/id/LC_MESSAGES/django.po b/conf/locale/id/LC_MESSAGES/django.po
@@ -8000,7 +8000,6 @@ msgid ""
 " yet, click {register_label_strong} at the top of the page."
 msgstr ""
 
-#: lms/templates/header/navbar-not-authenticated.html
 #: lms/templates/navigation/navbar-not-authenticated.html
 #: themes/stanford-style/lms/templates/register-form.html
 msgid "Register"
@@ -17516,6 +17515,10 @@ msgstr "Cara Kursus"
 msgid "Schools"
 msgstr "Kampus"
 
+#: lms/templates/header/navbar-not-authenticated.html
+msgid "Register for free"
+msgstr ""
+
 #: lms/templates/header/user_dropdown.html
 msgid "Resume your last course"
 msgstr "Ringkas pelatihan terakhir Anda"

diff --git a/conf/locale/it_IT/LC_MESSAGES/django.po b/conf/locale/it_IT/LC_MESSAGES/django.po
@@ -8777,7 +8777,6 @@ msgstr ""
 "{register_label_strong} nella parte superiore della pagina."
 
 #: openedx/core/djangoapps/user_authn/views/login.py
-#: lms/templates/header/navbar-not-authenticated.html
 #: lms/templates/navigation/navbar-not-authenticated.html
 #: themes/stanford-style/lms/templates/register-form.html
 msgid "Register"
@@ -18743,6 +18742,10 @@ msgstr "Come Funziona"
 msgid "Schools"
 msgstr "Scuole"
 
+#: lms/templates/header/navbar-not-authenticated.html
+msgid "Register for free"
+msgstr ""
+
 #: lms/templates/header/user_dropdown.html
 msgid "Resume your last course"
 msgstr "Riprendi l'ultimo corso "

diff --git a/conf/locale/ja_JP/LC_MESSAGES/django.po b/conf/locale/ja_JP/LC_MESSAGES/django.po
@@ -7668,7 +7668,6 @@ msgid ""
 " yet, click {register_label_strong} at the top of the page."
 msgstr ""
 
-#: lms/templates/header/navbar-not-authenticated.html
 #: lms/templates/navigation/navbar-not-authenticated.html
 #: themes/stanford-style/lms/templates/register-form.html
 msgid "Register"
@@ -16300,6 +16299,10 @@ msgstr "どのように機能するか"
 msgid "Schools"
 msgstr "学校"
 
+#: lms/templates/header/navbar-not-authenticated.html
+msgid "Register for free"
+msgstr ""
+
 #: lms/templates/header/user_dropdown.html
 msgid "Resume your last course"
 msgstr ""

diff --git a/conf/locale/ka/LC_MESSAGES/django.po b/conf/locale/ka/LC_MESSAGES/django.po
@@ -7866,7 +7866,6 @@ msgid ""
 " yet, click {register_label_strong} at the top of the page."
 msgstr ""
 
-#: lms/templates/header/navbar-not-authenticated.html
 #: lms/templates/navigation/navbar-not-authenticated.html
 #: themes/stanford-style/lms/templates/register-form.html
 msgid "Register"
@@ -17108,6 +17107,10 @@ msgstr "როგორ მუშაობს"
 msgid "Schools"
 msgstr "სკოლები"
 
+#: lms/templates/header/navbar-not-authenticated.html
+msgid "Register for free"
+msgstr ""
+
 #: lms/templates/header/user_dropdown.html
 msgid "Resume your last course"
 msgstr ""

diff --git a/conf/locale/lt_LT/LC_MESSAGES/django.po b/conf/locale/lt_LT/LC_MESSAGES/django.po
@@ -7555,7 +7555,6 @@ msgid ""
 " yet, click {register_label_strong} at the top of the page."
 msgstr ""
 
-#: lms/templates/header/navbar-not-authenticated.html
 #: lms/templates/navigation/navbar-not-authenticated.html
 #: themes/stanford-style/lms/templates/register-form.html
 msgid "Register"
@@ -16259,6 +16258,10 @@ msgstr "Kaip tai veikia"
 msgid "Schools"
 msgstr "Mokyklos"
 
+#: lms/templates/header/navbar-not-authenticated.html
+msgid "Register for free"
+msgstr ""
+
 #: lms/templates/header/user_dropdown.html
 msgid "Resume your last course"
 msgstr ""