Merge branch 'master' into django42

openedx · Apr 17, 2024 · 6b2d81b · 6b2d81b
2 parents 2297895 + 43ac63e
commit 6b2d81b
Show file tree

Hide file tree

Showing 199 changed files with 11,991 additions and 4,031 deletions.
diff --git a/.gitignore b/.gitignore
@@ -90,5 +90,8 @@ enterprise/static/enterprise/bundles/*.js
 # Virtual environments
 venv/
 
+# pyenv
+.python-version
+
 # TODO: When we move to be a service, ignore this too.
 #enterprise/static/enterprise/bundles/
diff --git a/.python-version b/.python-version
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