From 155bf2278841126045667afe07c6b30f09be3602 Mon Sep 17 00:00:00 2001 From: Akihiro Motoki Date: Mon, 23 Dec 2019 17:21:30 +0900 Subject: [PATCH] Drop babel extractor definitions from babel config Babel allows us to register babel extractors via entry points. This means we no longer need to have extractor definitions in each babel config files. All horizon plugins have copies of babel-django.cfg and babel-djangojs.cfg now. By dropping the extractor defintiions from babel config files, we can make a potential migration from django-babel to enmerkar (and we can also avoid more modifications of babel config files even if more transition is required). django-babel and enmerkar both define 'django' extractor in the entry point, so we can drop it from babel-django.cfg. This commit also registers 'angular' extractor, so we can drop the extractor for AngularJS from babel-djangojs.cfg. Change-Id: Icf93d4551bd3db1baa84c110f06dcc1c36e18b7e --- babel-django.cfg | 3 --- babel-djangojs.cfg | 7 ------- setup.cfg | 5 +++++ 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/babel-django.cfg b/babel-django.cfg index db1c9d55f4..f5e77263fb 100644 --- a/babel-django.cfg +++ b/babel-django.cfg @@ -1,6 +1,3 @@ -[extractors] -django = django_babel.extract:extract_django - [python: **.py] [django: **/templates/**.html] [django: **/templates/**.csv] diff --git a/babel-djangojs.cfg b/babel-djangojs.cfg index a8273b623e..f51212ad7a 100644 --- a/babel-djangojs.cfg +++ b/babel-djangojs.cfg @@ -1,10 +1,3 @@ -[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. diff --git a/setup.cfg b/setup.cfg index e112c44d35..0ed816195f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -54,3 +54,8 @@ add_comments = Translators: [entry_points] oslo.config.opts = openstack_dashboard = openstack_dashboard.utils.config:list_options +# We use a custom extractor to find translatable strings in AngularJS templates. +# See http://babel.pocoo.org/docs/messages/#referencing-extraction-methods for +# details on how this works. +babel.extractors = + angular = horizon.utils.babel_extract_angular:extract_angular