updated some docstrings, fixed issue #16, added some tests for i18n support

[django-tables2.git] / django_tables2 / tables.py

diff --git a/django_tables2/tables.py b/django_tables2/tables.py
index 3bd4c56cfe45d3f14e4665c05d7092167ff3fc54..abe49de602f4462f9ab9f44d8056a26229f3b0b6 100644 (file)
--- a/django_tables2/tables.py
+++ b/django_tables2/tables.py
@@ -161,7 +161,11 @@ class DeclarativeColumnsMetaclass(type):
         attrs["base_columns"] = SortedDict(parent_columns)
         # Possibly add some generated columns based on a model
         if opts.model:
-            extra = SortedDict(((f.name, Column()) for f in opts.model._meta.fields))
+            # We explicitly pass in verbose_name, so that if the table is
+            # instantiated with non-queryset data, model field verbose_names
+            # are used anyway.
+            extra = SortedDict(((f.name, Column(verbose_name=f.verbose_name))
+                                for f in opts.model._meta.fields))
             attrs["base_columns"].update(extra)
         # Explicit columns override both parent and generated columns
         attrs["base_columns"].update(SortedDict(columns))