openstack
/
karbor-dashboard
Code Issues Proposed changes

translation: drop babel extractor definitions 

babel extractors are now registered via python entry points,
so there is no need to declare babel extractors in babel configs.

This change is important to make translation work in Django 2.2.
django-babel does not work with Django 2.2 and looks unmaintained
for over two years. The horizon team is thinking to switch the extractor
to enmerkar (a fork of django-babel) to make extraction of translation
string work again near future. It is important to drop the extractor
definition to make the transition smooth.

django-babel (and enmerkar, a successor of django-babel) will be
installed via horizon, so we don't need to have it in requirements.txt
explicitly. It would make the transition of the babel extractor easy.
Babel is dropped from requirements.txt from the same reason.

Django dependency is also upadted to sync global-requirements.txt
to pass the requirements-check job.

Change-Id: I093d2c9789a142e909da6f3bedc12a91b181ab02
This commit is contained in:
Akihiro Motoki 2019-12-27 02:04:26 +09:00
parent 2859b78e82
commit adfd2c5862
3 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
babel-django.cfg
View File

@ -1,5 +1,2 @@
[extractors]
django = django_babel.extract:extract_django
[python: **.py]
[django: **/templates/**.html]

12
babel-djangojs.cfg
View File

@ -1,14 +1,2 @@
[extractors]
# We use a custom extractor to find translatable strings in AngularJS
# templates. The extractor is included in horizon.utils for now.
# See http://babel.pocoo.org/docs/messages/#referencing-extraction-methods for
# details on how this works.
angular = horizon.utils.babel_extract_angular:extract_angular
[javascript: **.js]
# We need to look into all static folders for HTML files.
# The **/static ensures that we also search within
# /openstack_dashboard/dashboards/XYZ/static which will ensure
# that plugins are also translated.
[angular: **/static/**.html]

4
requirements.txt
View File

@ -8,10 +8,8 @@
#
# PBR should always appear first
pbr!=2.1.0,>=2.0.0 # Apache-2.0
Babel!=2.4.0,>=2.3.4 # BSD
Django<2,>=1.11;python_version<'3.0' # BSD
Django<2.1,>=1.11;python_version>='3.0' # BSD
django-babel>=0.6.2 # BSD
Django<3.0,>=1.11;python_version>='3.0' # BSD
django-compressor>=2.0 # MIT
django-pyscss>=2.0.2 # BSD License (2 clause)
python-karborclient>=0.6.0 # Apache-2.0