Merge branch 'master' of git://github.com/bendavis78/django-formhelper

bendavis78 · Jul 4, 2011 · f9e5dfb · f9e5dfb
2 parents fd39a35 + a595b6e
commit f9e5dfb
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/formhelper/templatetags/formhelper.py b/formhelper/templatetags/formhelper.py
@@ -11,10 +11,10 @@
 def field_error(field):
     if field.errors:
         err = field.errors[0]
-        if err == unicode(field.field.default_error_messages.get('required')):
+        if err == unicode(field.field.error_messages.get('required')):
             err = '%s is required' % field.label
         else:
-            err = '%s: ' % field.label
+            err = '%s: %s' % (field.label, err)
         return err
     return ''