From 549bcc0bf081697b91e7bf292d6d9cfb1f9d94f2 Mon Sep 17 00:00:00 2001 From: Akihiro Motoki Date: Fri, 27 Dec 2019 02:32:03 +0900 Subject: [PATCH] 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. Change-Id: I17553cc99a4b2d63b5ae8669e431bcb352f278bc --- babel-django.cfg | 3 --- babel-djangojs.cfg | 12 ------------ 2 files changed, 15 deletions(-) diff --git a/babel-django.cfg b/babel-django.cfg index c241396..0f04fac 100644 --- a/babel-django.cfg +++ b/babel-django.cfg @@ -1,5 +1,2 @@ -[extractors] -django = django_babel.extract:extract_django - [python: watcher_dashboard/**.py] [django: watcher_dashboard/**/templates/**.html] diff --git a/babel-djangojs.cfg b/babel-djangojs.cfg index ade8d91..7e6dbd4 100644 --- a/babel-djangojs.cfg +++ b/babel-djangojs.cfg @@ -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: watcher_dashboard/**.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: watcher_dashboard/**/static/**.html]