Closes #13150: Wrap table column headers with gettext()

Co-authored-by: Jeremy Stretch <jstretch@netboxlabs.com>

netbox/tenancy/tables/columns.py

@@ -1,3 +1,4 @@
+from django.utils.translation import gettext_lazy as _
 import django_tables2 as tables
 
 from netbox.tables import columns
@@ -47,7 +48,7 @@ class TenantGroupColumn(tables.TemplateColumn):
 
     def __init__(self, accessor=tables.A('tenant__group'), *args, **kwargs):
         if 'verbose_name' not in kwargs:
-            kwargs['verbose_name'] = 'Tenant Group'
+            kwargs['verbose_name'] = _('Tenant Group')
 
         super().__init__(template_code=self.template_code, accessor=accessor, *args, **kwargs)
 
@@ -56,12 +57,17 @@ class TenantGroupColumn(tables.TemplateColumn):
 
 
 class TenancyColumnsMixin(tables.Table):
-    tenant_group = TenantGroupColumn()
-    tenant = TenantColumn()
+    tenant_group = TenantGroupColumn(
+        verbose_name=_('Tenant Group'),
+    )
+    tenant = TenantColumn(
+        verbose_name=_('Tenant'),
+    )
 
 
 class ContactsColumnMixin(tables.Table):
     contacts = columns.ManyToManyColumn(
+        verbose_name=_('Contacts'),
         linkify_item=True,
         transform=lambda obj: obj.contact.name
     )

netbox/tenancy/tables/contacts.py

@@ -1,3 +1,4 @@
+from django.utils.translation import gettext_lazy as _
 import django_tables2 as tables
 from django_tables2.utils import Accessor
 
@@ -15,12 +16,13 @@ __all__ = (
 
 class ContactGroupTable(NetBoxTable):
     name = columns.MPTTColumn(
+        verbose_name=_('Name'),
         linkify=True
     )
     contact_count = columns.LinkedCountColumn(
         viewname='tenancy:contact_list',
         url_params={'group_id': 'pk'},
-        verbose_name='Contacts'
+        verbose_name=_('Contacts')
     )
     tags = columns.TagColumn(
         url_name='tenancy:contactgroup_list'
@@ -36,6 +38,7 @@ class ContactGroupTable(NetBoxTable):
 
 class ContactRoleTable(NetBoxTable):
     name = tables.Column(
+        verbose_name=_('Name'),
         linkify=True
     )
     tags = columns.TagColumn(
@@ -50,19 +53,24 @@ class ContactRoleTable(NetBoxTable):
 
 class ContactTable(NetBoxTable):
     name = tables.Column(
+        verbose_name=_('Name'),
         linkify=True
     )
     group = tables.Column(
+        verbose_name=_('Group'),
         linkify=True
     )
     phone = tables.Column(
+        verbose_name=_('Phone'),
         linkify=linkify_phone,
     )
-    comments = columns.MarkdownColumn()
+    comments = columns.MarkdownColumn(
+        verbose_name=_('Comments'),
+    )
     assignment_count = columns.LinkedCountColumn(
         viewname='tenancy:contactassignment_list',
         url_params={'contact_id': 'pk'},
-        verbose_name='Assignments'
+        verbose_name=_('Assignments')
     )
     tags = columns.TagColumn(
         url_name='tenancy:contact_list'
@@ -79,41 +87,44 @@ class ContactTable(NetBoxTable):
 
 class ContactAssignmentTable(NetBoxTable):
     content_type = columns.ContentTypeColumn(
-        verbose_name='Object Type'
+        verbose_name=_('Object Type')
     )
     object = tables.Column(
+        verbose_name=_('Object'),
         linkify=True,
         orderable=False
     )
     contact = tables.Column(
+        verbose_name=_('Contact'),
         linkify=True
     )
     role = tables.Column(
+        verbose_name=_('Role'),
         linkify=True
     )
     contact_title = tables.Column(
         accessor=Accessor('contact__title'),
-        verbose_name='Contact Title'
+        verbose_name=_('Contact Title')
     )
     contact_phone = tables.Column(
         accessor=Accessor('contact__phone'),
-        verbose_name='Contact Phone'
+        verbose_name=_('Contact Phone')
     )
     contact_email = tables.Column(
         accessor=Accessor('contact__email'),
-        verbose_name='Contact Email'
+        verbose_name=_('Contact Email')
     )
     contact_address = tables.Column(
         accessor=Accessor('contact__address'),
-        verbose_name='Contact Address'
+        verbose_name=_('Contact Address')
     )
     contact_link = tables.Column(
         accessor=Accessor('contact__link'),
-        verbose_name='Contact Link'
+        verbose_name=_('Contact Link')
     )
     contact_description = tables.Column(
         accessor=Accessor('contact__description'),
-        verbose_name='Contact Description'
+        verbose_name=_('Contact Description')
     )
     actions = columns.ActionsColumn(
         actions=('edit', 'delete')

netbox/tenancy/tables/tenants.py

@@ -1,3 +1,4 @@
+from django.utils.translation import gettext_lazy as _
 import django_tables2 as tables
 from tenancy.models import *
 from tenancy.tables import ContactsColumnMixin
@@ -12,12 +13,13 @@ __all__ = (
 
 class TenantGroupTable(NetBoxTable):
     name = columns.MPTTColumn(
+        verbose_name=_('Name'),
         linkify=True
     )
     tenant_count = columns.LinkedCountColumn(
         viewname='tenancy:tenant_list',
         url_params={'group_id': 'pk'},
-        verbose_name='Tenants'
+        verbose_name=_('Tenants')
     )
     tags = columns.TagColumn(
         url_name='tenancy:tenantgroup_list'
@@ -33,12 +35,16 @@ class TenantGroupTable(NetBoxTable):
 
 class TenantTable(ContactsColumnMixin, NetBoxTable):
     name = tables.Column(
+        verbose_name=_('Name'),
         linkify=True
     )
     group = tables.Column(
+        verbose_name=_('Group'),
         linkify=True
     )
-    comments = columns.MarkdownColumn()
+    comments = columns.MarkdownColumn(
+        verbose_name=_('Comments'),
+    )
     tags = columns.TagColumn(
         url_name='tenancy:tenant_list'
     )