Switch to Flask-BabelPlus

flaskbb/auth/forms.py

@@ -15,7 +15,7 @@ from wtforms import (StringField, PasswordField, BooleanField, HiddenField,
                      SubmitField, SelectField)
 from wtforms.validators import (DataRequired, InputRequired, Email, EqualTo,
                                 regexp, ValidationError)
-from flask_babelex import lazy_gettext as _
+from flask_babelplus import lazy_gettext as _
 from flaskbb.user.models import User
 
 USERNAME_RE = r'^[\w.+-]+$'

flaskbb/auth/views.py

@@ -12,7 +12,7 @@
 from flask import Blueprint, flash, redirect, url_for, request, current_app
 from flask_login import (current_user, login_user, login_required,
                          logout_user, confirm_login, login_fresh)
-from flask_babelex import gettext as _
+from flask_babelplus import gettext as _
 
 from flaskbb.utils.helpers import render_template
 from flaskbb.email import send_reset_token

flaskbb/email.py

@@ -10,7 +10,7 @@
 """
 from flask import render_template
 from flask_mail import Message
-from flask_babelex import lazy_gettext as _
+from flask_babelplus import lazy_gettext as _
 
 from flaskbb.extensions import mail
 

flaskbb/extensions.py

@@ -18,7 +18,7 @@ from flask_redis import Redis
 from flask_migrate import Migrate
 from flask_themes2 import Themes
 from flask_plugins import PluginManager
-from flask_babelex import Babel
+from flask_babelplus import Babel
 from flask_wtf.csrf import CsrfProtect
 
 from flaskbb.exceptions import AuthorizationRequired

flaskbb/forum/forms.py

@@ -12,7 +12,7 @@ from flask_wtf import Form
 from wtforms import (TextAreaField, StringField, SelectMultipleField,
                      BooleanField, SubmitField)
 from wtforms.validators import DataRequired, Optional, Length
-from flask_babelex import lazy_gettext as _
+from flask_babelplus import lazy_gettext as _
 
 from flaskbb.forum.models import Topic, Post, Report, Forum
 from flaskbb.user.models import User

flaskbb/forum/views.py

@@ -14,7 +14,7 @@ import datetime
 from sqlalchemy import asc, desc
 from flask import Blueprint, redirect, url_for, current_app, request, flash
 from flask_login import login_required, current_user
-from flask_babelex import gettext as _
+from flask_babelplus import gettext as _
 from flask_allows import Permission, And
 from flaskbb.extensions import db, allows
 from flaskbb.utils.settings import flaskbb_config

flaskbb/management/forms.py

@@ -20,7 +20,7 @@ from wtforms.ext.sqlalchemy.fields import (
     QuerySelectField, QuerySelectMultipleField
 )
 from sqlalchemy.orm.session import make_transient, make_transient_to_detached
-from flask_babelex import lazy_gettext as _
+from flask_babelplus import lazy_gettext as _
 
 from flaskbb.utils.fields import BirthdayField
 from flaskbb.utils.widgets import SelectBirthdayWidget

flaskbb/management/views.py

@@ -15,7 +15,7 @@ from flask import (Blueprint, current_app, request, redirect, url_for, flash,
                    jsonify, __version__ as flask_version)
 from flask_login import current_user
 from flask_plugins import get_all_plugins, get_plugin, get_plugin_from_all
-from flask_babelex import gettext as _
+from flask_babelplus import gettext as _
 from flask_allows import Permission, Not
 
 from flaskbb import __version__ as flaskbb_version

flaskbb/message/forms.py

@@ -12,7 +12,7 @@ from flask_login import current_user
 from flask_wtf import Form
 from wtforms import StringField, TextAreaField, ValidationError, SubmitField
 from wtforms.validators import DataRequired
-from flask_babelex import lazy_gettext as _
+from flask_babelplus import lazy_gettext as _
 
 from flaskbb.user.models import User
 from flaskbb.message.models import Conversation, Message

flaskbb/message/views.py

@@ -13,7 +13,7 @@ from datetime import datetime
 
 from flask import Blueprint, redirect, request, url_for, flash, abort
 from flask_login import login_required, current_user
-from flask_babelex import gettext as _
+from flask_babelplus import gettext as _
 
 from flaskbb.extensions import db
 from flaskbb.utils.settings import flaskbb_config

flaskbb/plugins/portal/views.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 from flask import Blueprint, current_app, flash, request
-from flask_babelex import gettext as _
+from flask_babelplus import gettext as _
 from flask_login import current_user
 
 from flaskbb.utils.helpers import render_template

flaskbb/user/forms.py

@@ -14,7 +14,7 @@ from wtforms import (StringField, PasswordField, TextAreaField, SelectField,
                      ValidationError, SubmitField)
 from wtforms.validators import (Length, DataRequired, InputRequired, Email,
                                 EqualTo, Optional, URL)
-from flask_babelex import lazy_gettext as _
+from flask_babelplus import lazy_gettext as _
 
 from flaskbb.user.models import User
 from flaskbb.extensions import db

flaskbb/user/views.py

@@ -12,7 +12,7 @@
 from flask import Blueprint, flash, request
 from flask_login import login_required, current_user
 from flask_themes2 import get_themes_list
-from flask_babelex import gettext as _
+from flask_babelplus import gettext as _
 
 from flaskbb.extensions import babel
 from flaskbb.utils.helpers import render_template

flaskbb/utils/helpers.py

@@ -20,7 +20,7 @@ import requests
 import unidecode
 from flask import session, url_for, flash
 from babel.dates import format_timedelta
-from flask_babelex import lazy_gettext as _
+from flask_babelplus import lazy_gettext as _
 from flask_themes2 import render_theme_template
 from flask_login import current_user
 

flaskbb/utils/translations.py

@@ -2,7 +2,7 @@ import os
 
 import babel
 
-from flask_babelex import Domain, get_locale
+from flask_babelplus import Domain, get_locale
 from flask_plugins import get_enabled_plugins
 
 

requirements.txt

@@ -5,6 +5,7 @@ cov-core==1.15.0
 coverage==4.0.3
 Flask==0.10.1
 flask-allows==0.1.0
+Flask-BabelPlus==1.0.1
 Flask-Cache==0.13.1
 Flask-DebugToolbar==0.10.0
 Flask-Login==0.3.2
@@ -34,5 +35,4 @@ Unidecode==0.04.19
 Werkzeug==0.11.3
 Whoosh==2.7.0
 WTForms==2.1
-https://github.com/sh4nks/flask-babelex/tarball/master#egg=Flask-BabelEx
 https://github.com/jshipley/Flask-WhooshAlchemy/archive/master.zip#egg=Flask-Whooshalchemy