Adapting Babel to new FAB version, regenerating translations (#684)

caravel/forms.py

@@ -9,7 +9,7 @@ from copy import copy
 import json
 import math
 
-from flask_babelpkg import lazy_gettext as _
+from flask_babel import lazy_gettext as _
 from wtforms import (
     Form, SelectMultipleField, SelectField, TextField, TextAreaField,
     BooleanField, IntegerField, HiddenField, DecimalField)

caravel/models.py

@@ -23,7 +23,7 @@ from flask import request, g
 from flask_appbuilder import Model
 from flask_appbuilder.models.mixins import AuditMixin
 from flask_appbuilder.models.decorators import renders
-from flask_babelpkg import lazy_gettext as _
+from flask_babel import lazy_gettext as _
 
 from pydruid.client import PyDruid
 from pydruid.utils.filters import Dimension, Filter

caravel/views.py

@@ -22,8 +22,8 @@ from flask_appbuilder import ModelView, CompactCRUDMixin, BaseView, expose
 from flask_appbuilder.actions import action
 from flask_appbuilder.models.sqla.interface import SQLAInterface
 from flask_appbuilder.security.decorators import has_access, has_access_api
-from flask_babelpkg import gettext as __
-from flask_babelpkg import lazy_gettext as _
+from flask_babel import gettext as __
+from flask_babel import lazy_gettext as _
 from flask_appbuilder.models.sqla.filters import BaseFilter
 
 from sqlalchemy import create_engine, select, text

caravel/viz.py

@@ -20,7 +20,7 @@ from datetime import datetime, timedelta
 import pandas as pd
 import numpy as np
 from flask import request
-from flask_babelpkg import lazy_gettext as _
+from flask_babel import lazy_gettext as _
 from markdown import markdown
 import simplejson as json
 from six import string_types

setup.py

@@ -16,10 +16,8 @@ setup(
     zip_safe=False,
     scripts=['caravel/bin/caravel'],
     install_requires=[
-        'babel==2.3.4',
         'cryptography==1.4',
         'flask-appbuilder==1.8.1',
-        'Flask-BabelPkg==0.9.6',
         'flask-cache==0.13.1',
         'flask-migrate==1.5.1',
         'flask-script==2.0.5',