Commit 2049eab8 authored by Fantix King's avatar Fantix King

Fix circular import between `babel` and `helpers`, so that:

 * `from flask.ext.admin.babel import gettext` returns the right one
 * I18n in `flash_errors` works correctly
parent c44d77e2
...@@ -4,7 +4,6 @@ from flask import g, request, url_for, flash ...@@ -4,7 +4,6 @@ from flask import g, request, url_for, flash
from wtforms.validators import DataRequired, InputRequired from wtforms.validators import DataRequired, InputRequired
from flask.ext.admin._compat import urljoin, urlparse, iteritems from flask.ext.admin._compat import urljoin, urlparse, iteritems
from flask.ext.admin.babel import gettext
from ._compat import string_types from ._compat import string_types
...@@ -96,6 +95,7 @@ def is_field_error(errors): ...@@ -96,6 +95,7 @@ def is_field_error(errors):
def flash_errors(form, message): def flash_errors(form, message):
from flask.ext.admin.babel import gettext
for field_name, errors in iteritems(form.errors): for field_name, errors in iteritems(form.errors):
errors = form[field_name].label.text + u": " + u", ".join(errors) errors = form[field_name].label.text + u": " + u", ".join(errors)
flash(gettext(message, error=str(errors)), 'error') flash(gettext(message, error=str(errors)), 'error')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment