Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat!: remove Transifex calls for FC-0012 - OEP-58 #445

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions .tx/config

This file was deleted.

8 changes: 8 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@ Please See the `releases tab <https://github.com/openedx/xblock-lti-consumer/rel

Unreleased
~~~~~~~~~~
* Remove Transifex calls and bundled translation files for the OEP-58 proposal.

BREAKING CHANGE: This version breaks translations with Quince and earlier releases.

9.9.0 (2024-01-24)
---------------------------
* XBlockI18NService js translations support

9.8.3 - 2024-01-23
------------------
* Additional NewRelic traces to functions suspected of causing performance issues.
Expand Down
11 changes: 0 additions & 11 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
------------------------

Expand Down
2 changes: 1 addition & 1 deletion lti_consumer/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
from .apps import LTIConsumerApp
from .lti_xblock import LtiConsumerXBlock

__version__ = '9.8.3'
__version__ = '9.9.0'
11 changes: 0 additions & 11 deletions lti_consumer/conf/locale/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
35 changes: 15 additions & 20 deletions lti_consumer/lti_xblock.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -257,6 +256,7 @@
"""

block_settings_key = 'lti_consumer'
i18n_js_namespace = 'XBlockLtiConsumerI18N'

display_name = String(
display_name=_("Display Name"),
Expand Down Expand Up @@ -662,20 +662,15 @@
]
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):
Expand Down Expand Up @@ -1197,9 +1192,9 @@
)
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)

Check warning on line 1197 in lti_consumer/lti_xblock.py

View check run for this annotation

Codecov / codecov/patch

lti_consumer/lti_xblock.py#L1197

Added line #L1197 was not covered by tests
fragment.initialize_js('LtiConsumerXBlock')
return fragment

Expand All @@ -1224,9 +1219,9 @@
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

Expand Down
Loading