feat: standardize make extract_translations

Changelog.md

@@ -1,6 +1,16 @@
 Drag and Drop XBlock changelog
 ==============================
 
+Version 3.1.3 (2023-04-15)
+--------------------------
+
+* Prepare repository for upcoming changes related to [openedx-translations](https://github.com/openedx/openedx-translations).
+  * `conf/locale` directory is now the source of truth for translations.
+  * `translations` directory is now a symbolic link for backwards compatibility.
+  * `locale` symbolic link is deleted to avoid too many symbolic links.
+  * `en` translations are now extracted into `django.po` instead of `text.po`.
+  * `en` `text.po` is now a symbolic link to `django.po` for backwards compatibility.
+
 Version 3.1.0 (2023-01-31)
 --------------------------
 

Makefile

@@ -6,10 +6,10 @@
 
 WORKING_DIR := drag_and_drop_v2
 JS_TARGET := $(WORKING_DIR)/public/js/translations
-EXTRACT_DIR := $(WORKING_DIR)/translations/en/LC_MESSAGES
+EXTRACT_DIR := $(WORKING_DIR)/conf/locale/en/LC_MESSAGES
 EXTRACTED_DJANGO := $(EXTRACT_DIR)/django-partial.po
 EXTRACTED_DJANGOJS := $(EXTRACT_DIR)/djangojs-partial.po
-EXTRACTED_TEXT := $(EXTRACT_DIR)/text.po
+EXTRACTED_TEXT := $(EXTRACT_DIR)/django.po
 
 FIREFOX_VERSION := "43.0"
 

README.md

@@ -527,6 +527,8 @@ Updates to translated strings are supposed to be propagated to `text.po` files.
 
 [edx-i18n-tools]: https://github.com/openedx/i18n-tools
 
+Note: currently `translations` directory is a symbolic link to `conf/locale` directory. Also, 'text.po' file for locale code `en` is a symbolic link to `conf/locale/en/LC_MESSAGES/django.po` file. Both links works as a transition step to fully moving translation files to [openedx-translations](https://github.com/openedx/openedx-translations) repository
+
 Translatable strings
 --------------------
 ```bash

drag_and_drop_v2/__init__.py

@@ -1,4 +1,4 @@
 """ Drag and Drop v2 XBlock """
 from .drag_and_drop_v2 import DragAndDropBlock
 
-__version__ = "3.1.2"
+__version__ = "3.1.3"

drag_and_drop_v2/conf/locale/en/LC_MESSAGES/text.po

@@ -0,0 +1 @@
+django.po

drag_and_drop_v2/translations

@@ -0,0 +1 @@
+conf/locale/

manage.py

@@ -6,7 +6,7 @@
 if __name__ == "__main__":
     os.environ.setdefault(
         "DJANGO_SETTINGS_MODULE",
-        "drag_and_drop_v2.locale.settings"
+        "drag_and_drop_v2.conf.locale.settings"
     )
 
     execute_from_command_line(sys.argv)

setup.py

@@ -120,6 +120,6 @@ def package_data(pkg, root_list):
         'xblock.v1': 'drag-and-drop-v2 = drag_and_drop_v2:DragAndDropBlock',
     },
     packages=['drag_and_drop_v2'],
-    package_data=package_data("drag_and_drop_v2", ["static", "templates", "public", "translations", "locale"]),
+    package_data=package_data("drag_and_drop_v2", ["static", "templates", "public", "translations"]),
     python_requires=">=3.8",
 )