Merge branch 'master' of https://github.com/openedx/edx-enterprise in…

…to hamza/ENT-7908-cmd-to-reencrypt-reporting-config
openedx · Nov 20, 2023 · 47e8f78 · 47e8f78
2 parents 1506360 + 6dc9000
commit 47e8f78
Show file tree

Hide file tree

Showing 23 changed files with 1,467 additions and 1,930 deletions.
diff --git a/.tx/config b/.tx/config
@@ -2,14 +2,14 @@
 host = https://www.transifex.com
 
 [o:open-edx:p:edx-platform:r:edx-enterprise]
-file_filter = enterprise/locale/<lang>/LC_MESSAGES/django.po
-source_file = enterprise/locale/en/LC_MESSAGES/django.po
+file_filter = enterprise/conf/locale/<lang>/LC_MESSAGES/django.po
+source_file = enterprise/conf/locale/en/LC_MESSAGES/django.po
 source_lang = en
 type        = PO
 
 [o:open-edx:p:edx-platform:r:edx-enterprise-js]
-file_filter = enterprise/locale/<lang>/LC_MESSAGES/djangojs.po
-source_file = enterprise/locale/en/LC_MESSAGES/djangojs.po
+file_filter = enterprise/conf/locale/<lang>/LC_MESSAGES/djangojs.po
+source_file = enterprise/conf/locale/en/LC_MESSAGES/djangojs.po
 source_lang = en
 type        = PO
 
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -17,6 +17,10 @@ Unreleased
 ----------
 Nothing unreleased.
 
+[4.7.2]
+--------
+feat: stop learner data transmissions for course runs
+
 [4.7.1]
 --------
 chore: retire Degreed v1 code from the set of channels

diff --git a/Makefile b/Makefile
@@ -52,8 +52,7 @@ dummy_translations: ## generate dummy translation (.po) files
 
 extract_translations: ## extract strings to be translated, outputting .mo files
 	rm -rf docs/_build
-	./manage.py makemessages -l en -v1 -d django
-	./manage.py makemessages -l en -v1 -d djangojs -i "node_modules/*"
+	i18n_tool extract --no-segment
 
 fake_translations: extract_translations dummy_translations compile_translations ## generate and compile dummy translation files
 

diff --git a/enterprise/__init__.py b/enterprise/__init__.py
@@ -2,4 +2,4 @@
 Your project description goes here.
 """
 
-__version__ = "4.7.1"
+__version__ = "4.7.2"
diff --git a/enterprise/locale/config.yaml → enterprise/conf/locale/config.yaml b/enterprise/locale/config.yaml → enterprise/conf/locale/config.yaml
@@ -83,3 +83,6 @@ locales:
 # The locales used for fake-accented English, for testing.
 dummy_locales:
     - eo
+
+ignore_dirs:
+    - node_modules
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,6 +17,10 @@ Unreleased @@
     ----------
     Nothing unreleased.
+    [4.7.2]
+    --------
+    feat: stop learner data transmissions for course runs
     [4.7.1]
     --------
     chore: retire Degreed v1 code from the set of channels
@@ Expand Down @@