Merge remote-tracking branch 'origin/jenkins/add-python312-support-51…

…6d289' into jenkins/add-python312-support-516d289

CHANGELOG.rst

@@ -15,9 +15,12 @@ Please See the `releases tab <https://github.com/openedx/xblock-lti-consumer/rel
 
 Unreleased
 ~~~~~~~~~~
-9.9.0 - 2024-02-29
+9.10.0 - 2024-02-29
 ------------------
 * Adding python 3.12 support. Dropping django32 support.
+9.9.0 (2024-01-24)
+---------------------------
+* XBlockI18NService js translations support
 
 9.8.3 - 2024-01-23
 ------------------

README.rst

@@ -124,17 +124,6 @@ This list is what is used to resolve dependencies when an upstream project is co
 this XBlock package. requirements.txt is used to install the same dependencies when running
 the tests for this package.
 
-Downloading translations from Transifex
----------------------------------------
-
-If you want to download translations from Transifex install
-`transifex client <https://docs.transifex.com/client/installing-the-client/>`_ and run this command while
-inside project root directory:
-
-.. code:: bash
-
-    $ tx pull -f --mode=reviewed
-
 Further Development Info
 ------------------------
 

catalog-info.yaml

@@ -16,5 +16,5 @@ metadata:
 spec:
   type: XBlock
   lifecycle: production
-  owner: masters-devs-cosmonauts
+  owner: ~
   subcomponentOf: LTI

lti_consumer/conf/locale/config.yaml

@@ -2,17 +2,6 @@
 
 locales:
   - en  # English - Source Language
-  - ar  # Arabic
-  - es_419  # Spanish (Latin America)
-  - fr  # French
-  - he  # Hebrew
-  - hi  # Hindi
-  - ja_JP  # Japanese (Japan)
-  - ko_KR  # Korean (Korea)
-  - pt_BR  # Portuguese (Brazil)
-  - pt_PT  # Portuguese (Portugal)
-  - ru  # Russian
-  - zh_CN  # Chinese (China)
 
 # Directories we don't search for strings.
 ignore_dirs:

lti_consumer/lti_xblock.py

@@ -55,11 +55,10 @@
 import urllib.parse
 from collections import namedtuple
 from importlib import import_module
-import pkg_resources
 
 import bleach
 from django.conf import settings
-from django.utils import timezone, translation
+from django.utils import timezone
 from web_fragments.fragment import Fragment
 
 from webob import Response
@@ -257,6 +256,7 @@ class LtiConsumerXBlock(StudioEditableXBlockMixin, XBlock):
     """
 
     block_settings_key = 'lti_consumer'
+    i18n_js_namespace = 'XBlockLtiConsumerI18N'
 
     display_name = String(
         display_name=_("Display Name"),
@@ -662,20 +662,15 @@ def workbench_scenarios():
         ]
         return scenarios
 
-    @staticmethod
-    def _get_statici18n_js_url(loader):  # pragma: no cover
-        """
-        Returns the Javascript translation file for the currently selected language, if any found by
-        `pkg_resources`
-        """
-        lang_code = translation.get_language()
-        if not lang_code:
-            return None
-        text_js = 'public/js/translations/{lang_code}/text.js'
-        country_code = lang_code.split('-')[0]
-        for code in (translation.to_locale(lang_code), lang_code, country_code):
-            if pkg_resources.resource_exists(loader.module_name, text_js.format(lang_code=code)):
-                return text_js.format(lang_code=code)
+    def _get_statici18n_js_url(self):
+        """
+        Return the JavaScript translation file provided by the XBlockI18NService.
+        """
+        if i18n_service := self.runtime.service(self, 'i18n'):
+            if url_getter_func := getattr(i18n_service, 'get_javascript_i18n_catalog_url', None):
+                if javascript_url := url_getter_func(self):
+                    return javascript_url
+
         return None
 
     def validate_field_data(self, validation, data):
@@ -1197,9 +1192,9 @@ def author_view(self, context):
         )
         fragment.add_css(loader.load_unicode('static/css/student.css'))
         fragment.add_javascript(loader.load_unicode('static/js/xblock_lti_consumer.js'))
-        statici18n_js_url = self._get_statici18n_js_url(loader)
+        statici18n_js_url = self._get_statici18n_js_url()
         if statici18n_js_url:
-            fragment.add_javascript_url(self.runtime.local_resource_url(self, statici18n_js_url))
+            fragment.add_javascript_url(statici18n_js_url)
         fragment.initialize_js('LtiConsumerXBlock')
         return fragment
 
@@ -1224,9 +1219,9 @@ def student_view(self, context):
         fragment.add_content(loader.render_mako_template('/templates/html/student.html', context))
         fragment.add_css(loader.load_unicode('static/css/student.css'))
         fragment.add_javascript(loader.load_unicode('static/js/xblock_lti_consumer.js'))
-        statici18n_js_url = self._get_statici18n_js_url(loader)
+        statici18n_js_url = self._get_statici18n_js_url()
         if statici18n_js_url:
-            fragment.add_javascript_url(self.runtime.local_resource_url(self, statici18n_js_url))
+            fragment.add_javascript_url(statici18n_js_url)
         fragment.initialize_js('LtiConsumerXBlock')
         return fragment