Index: Flask-Admin-1.6.1/flask_admin/tests/sqla/test_basic.py =================================================================== --- Flask-Admin-1.6.1.orig/flask_admin/tests/sqla/test_basic.py +++ Flask-Admin-1.6.1/flask_admin/tests/sqla/test_basic.py @@ -7,7 +7,7 @@ from flask_admin.form.fields import Sele from flask_admin._compat import as_unicode from flask_admin._compat import iteritems from flask_admin.contrib.sqla import ModelView, filters, tools -from flask_babelex import Babel +from flask_babel import Babel from sqlalchemy.ext.hybrid import hybrid_property from sqlalchemy import cast Index: Flask-Admin-1.6.1/flask_admin/tests/sqla/test_translation.py =================================================================== --- Flask-Admin-1.6.1.orig/flask_admin/tests/sqla/test_translation.py +++ Flask-Admin-1.6.1/flask_admin/tests/sqla/test_translation.py @@ -1,5 +1,5 @@ from flask_admin.babel import lazy_gettext -from flask_babelex import Babel +from flask_babel import Babel from . import setup from .test_basic import CustomModelView, create_models Index: Flask-Admin-1.6.1/flask_admin/babel.py =================================================================== --- Flask-Admin-1.6.1.orig/flask_admin/babel.py +++ Flask-Admin-1.6.1/flask_admin/babel.py @@ -1,8 +1,5 @@ try: - try: - from flask_babelex import Domain - except ImportError: - from flask_babel import Domain + from flask_babel import Domain except ImportError: def gettext(string, **variables): Index: Flask-Admin-1.6.1/flask_admin/base.py =================================================================== --- Flask-Admin-1.6.1.orig/flask_admin/base.py +++ Flask-Admin-1.6.1/flask_admin/base.py @@ -524,6 +524,13 @@ class Admin(object): # Add index view self._set_admin_index_view(index_view=index_view, endpoint=endpoint, url=url) + # Initialise Babel, if we have it + try: + from flask_babel import Babel + Babel(app) + except ImportError: + pass + # Register with application if app is not None: self._init_extension()