Skip to content

Commit 3a499d9

Browse files
committed
feat: use XBlockI18NService js translations
1 parent ad6ad2b commit 3a499d9

File tree

1 file changed

+22
-5
lines changed

1 file changed

+22
-5
lines changed

drag_and_drop_v2/drag_and_drop_v2.py

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@ class DragAndDropBlock(
8080
SOLUTION_INCORRECT: None
8181
}
8282

83+
i18n_js_namespace = 'DragAndDropI18N'
84+
8385
display_name = String(
8486
display_name=_("Title"),
8587
help=_("The title of the drag and drop problem. The title is displayed to learners."),
@@ -320,10 +322,13 @@ def _learner_raw_score(self):
320322
return correct_count / float(total_count)
321323

322324
@staticmethod
323-
def _get_statici18n_js_url():
325+
def get_deprecated_i18n_js_url():
324326
"""
325-
Returns the Javascript translation file for the currently selected language, if any found by
327+
Returns the deprecated JavaScript translation file for the currently selected language, if any found by
326328
`pkg_resources`
329+
330+
This method is returns pre-OEP-58 i18n files and will be deprecated in favor
331+
of `get_javascript_i18n_catalog_url`.
327332
"""
328333
lang_code = translation.get_language()
329334
if not lang_code:
@@ -335,6 +340,19 @@ def _get_statici18n_js_url():
335340
return text_js.format(lang_code=code)
336341
return None
337342

343+
def _get_statici18n_js_url(self):
344+
"""
345+
Return the JavaScript translation file provided by the XBlockI18NService.
346+
"""
347+
if url_getter_func := getattr(self.i18n_service, 'get_javascript_i18n_catalog_url', None):
348+
if javascript_url := url_getter_func(self):
349+
return javascript_url
350+
351+
if deprecated_url := DragAndDropBlock.get_deprecated_i18n_js_url():
352+
return self.runtime.local_resource_url(self, deprecated_url)
353+
354+
return None
355+
338356
@XBlock.supports("multi_device") # Enable this block for use in the mobile app via webview
339357
def student_view(self, context):
340358
"""
@@ -352,9 +370,8 @@ def student_view(self, context):
352370
'public/js/drag_and_drop.js',
353371
]
354372

355-
statici18n_js_url = self._get_statici18n_js_url()
356-
if statici18n_js_url:
357-
js_urls.append(statici18n_js_url)
373+
if static_i18n_js_url := self.get_javascript_i18n_catalog_url():
374+
js_urls.append(static_i18n_js_url)
358375

359376
for css_url in css_urls:
360377
fragment.add_css_url(self.runtime.local_resource_url(self, css_url))

0 commit comments

Comments
 (0)