Commit 962f133f authored by Claude Paroz's avatar Claude Paroz
Browse files

Fixed #18483 -- Marked hidden field error string for translation 

Thanks Evil Clay for the report and Emil Stenstrom for the initial
patch.
parent 6605ac33

django/forms/forms.py

+6 −2
Original line number Diff line number Diff line
@@ -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