diff --git a/debianmemberportfolio/__init__.py b/debianmemberportfolio/__init__.py index 56f6669..1667908 100644 --- a/debianmemberportfolio/__init__.py +++ b/debianmemberportfolio/__init__.py @@ -22,7 +22,7 @@ # from flask import Flask -from flask.ext.babel import Babel +from flask_babel import Babel app = Flask(__name__) babel = Babel(app) diff --git a/debianmemberportfolio/forms.py b/debianmemberportfolio/forms.py index f35d02a..530f134 100644 --- a/debianmemberportfolio/forms.py +++ b/debianmemberportfolio/forms.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals -from flask.ext.babel import gettext as _ -from flask.ext.wtf import Form +from flask_babel import gettext as _ +from flask_wtf import Form from wtforms import IntegerField, StringField, RadioField from wtforms.validators import ( AnyOf, DataRequired, Email, Length, Optional, Regexp diff --git a/debianmemberportfolio/model/urlbuilder.py b/debianmemberportfolio/model/urlbuilder.py index 26e786d..f948ddc 100644 --- a/debianmemberportfolio/model/urlbuilder.py +++ b/debianmemberportfolio/model/urlbuilder.py @@ -32,7 +32,7 @@ from encodings.utf_8 import StreamReader as UTF8StreamReader import pkg_resources from debianmemberportfolio.model import keyfinder from urllib.parse import quote_plus -from flask.ext.babel import gettext as _, lazy_gettext as N_ +from flask_babel import gettext as _, lazy_gettext as N_ my_config = ConfigParser() diff --git a/debianmemberportfolio/views.py b/debianmemberportfolio/views.py index 338ba2f..ab80d57 100644 --- a/debianmemberportfolio/views.py +++ b/debianmemberportfolio/views.py @@ -25,7 +25,7 @@ import logging from debianmemberportfolio import app, babel from flask import g, make_response, request, render_template, abort -from flask.ext.babel import lazy_gettext as N_ +from flask_babel import lazy_gettext as N_ from config import LANGUAGES from .forms import DeveloperData, DeveloperDataRequest from .model import dddatabuilder diff --git a/docs/source/devdocs.rst b/docs/source/devdocs.rst index 8e03b5c..bff484c 100644 --- a/docs/source/devdocs.rst +++ b/docs/source/devdocs.rst @@ -123,8 +123,8 @@ dictionary keys correspond to sections in the ini file. The dictionary values are dictionaries themselves that contain a special key ``label`` that defines the label of the section in the output and keys for each entry to be rendered in that section. The values in these sub-dictionaries are strings marked for -translation using the :py:func:`~flask.ext.babel.lazy_gettext` function from -:py:mod:`flask.ext.babel`. +translation using the :py:func:`~flask_babel.lazy_gettext` function from +:py:mod:`flask_babel`. The patterns in :file:`portfolio.ini` can contain the following placeholders that are filled at runtime: