Allow non-basestrings (e.g: ugettext_lazy) to be used in verbose_name.

diff --git a/django_tables/base.py b/django_tables/base.py
index b08e061d4e3eab69464a682f5eb7fb764c74e6ea..686328ad40481926001ece285fa866a89d885923 100644 (file)
--- a/django_tables/base.py
+++ b/django_tables/base.py
@@ -2,7 +2,7 @@ import copy
 from django.http import Http404\r
 from django.core import paginator\r
 from django.utils.datastructures import SortedDict\r
-from django.utils.encoding import StrAndUnicode\r
+from django.utils.encoding import force_unicode, StrAndUnicode\r
 from django.utils.text import capfirst\r
 from columns import Column\r
 from options import options\r
@@ -318,7 +318,8 @@ class BoundColumn(StrAndUnicode):
     values = property(_get_values)\r
 \r
     def __unicode__(self):\r
-        return capfirst(self.column.verbose_name or self.name.replace('_', ' '))\r
+        s = self.column.verbose_name or self.name.replace('_', ' ')\r
+        return capfirst(force_unicode(s))\r
 \r
     def as_html(self):\r
         pass\r