Merge branch 'fix-90-fieldset-ugettext_lazy' of git:https://github.com/bmih…

…elac/django-uni-form
DanielKotik · Sep 17, 2011 · fd3d126 · fd3d126
2 parents 53002bf + 15fd28d
commit fd3d126
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/uni_form/helpers.py b/uni_form/helpers.py
@@ -251,7 +251,7 @@ class Fieldset(object):
  def __init__(self, legend, *fields, **kwargs):
  self.css_class = kwargs.get('css_class', None)
  self.css_id = kwargs.get('css_id', None)
- self.legend = Template(legend)
+ self.legend = legend
  self.fields = list(fields)
 
  def render(self, form, form_style, context):
@@ -264,7 +264,8 @@ def render(self, form, form_style, context):
  html += u' class="%s"' % form_style
  html += '>'
 
- html += self.legend and (u'<legend>%s</legend>' % self.legend.render(context)) or ''
+ if self.legend:
+ html += u'<legend>%s</legend>' % Template(unicode(self.legend)).render(context)
  for field in self.fields:
  html += render_field(field, form, form_style, context)
  html += u'</fieldset>'