summaryrefslogtreecommitdiff
path: root/django/forms/forms.py
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2013-01-26 19:57:10 +0100
committerClaude Paroz <claude@2xlibre.net>2013-01-26 19:59:44 +0100
commit962f133f72abe2a1174d48baa52aa8549762a022 (patch)
treec8845203a290069052a347d87a352ddc07ced1d6 /django/forms/forms.py
parent6605ac331a9e03fa41c301d122c5727c0d98b970 (diff)
Fixed #18483 -- Marked hidden field error string for translation
Thanks Evil Clay for the report and Emil Stenstrom for the initial patch.
Diffstat (limited to 'django/forms/forms.py')
-rw-r--r--django/forms/forms.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/django/forms/forms.py b/django/forms/forms.py
index a33bf8a648..9c5dc3eb5c 100644
--- a/django/forms/forms.py
+++ b/django/forms/forms.py
@@ -14,6 +14,7 @@ from django.utils.datastructures import SortedDict
from django.utils.html import conditional_escape, format_html
from django.utils.encoding import smart_text, force_text, python_2_unicode_compatible
from django.utils.safestring import mark_safe
+from django.utils.translation import ugettext as _
from django.utils import six
@@ -148,10 +149,13 @@ class BaseForm(object):
for name, field in self.fields.items():
html_class_attr = ''
bf = self[name]
- bf_errors = self.error_class([conditional_escape(error) for error in bf.errors]) # Escape and cache in local variable.
+ # Escape and cache in local variable.
+ bf_errors = self.error_class([conditional_escape(error) for error in bf.errors])
if bf.is_hidden:
if bf_errors:
- top_errors.extend(['(Hidden field %s) %s' % (name, force_text(e)) for e in bf_errors])
+ top_errors.extend(
+ [_('(Hidden field %(name)s) %(error)s') % {'name': name, 'error': force_text(e)}
+ for e in bf_errors])
hidden_fields.append(six.text_type(bf))
else:
# Create a 'class="..."' atribute if the row should have any