diff --git a/netbox/netbox/tables/tables.py b/netbox/netbox/tables/tables.py index 20eab822d..27f5edabe 100644 --- a/netbox/netbox/tables/tables.py +++ b/netbox/netbox/tables/tables.py @@ -7,7 +7,7 @@ from django.db.models.fields.related import RelatedField from django.urls import reverse from django.urls.exceptions import NoReverseMatch from django.utils.safestring import mark_safe -from django.utils.translation import gettext as _ +from django.utils.translation import gettext_lazy as _ from django_tables2.data import TableQuerysetData from extras.models import CustomField, CustomLink @@ -170,13 +170,16 @@ class NetBoxTable(BaseTable): * Actions """ pk = columns.ToggleColumn( + verbose_name=_('Pk'), visible=False ) id = tables.Column( linkify=True, - verbose_name='ID' + verbose_name=_('ID') + ) + actions = columns.ActionsColumn( + verbose_name=_('Actions'), ) - actions = columns.ActionsColumn() exempt_columns = ('pk', 'actions') @@ -223,11 +226,16 @@ class SearchTable(tables.Table): order_by="object___meta__verbose_name", ) object = tables.Column( + verbose_name=_('Object'), linkify=True, order_by=('name', ) ) - field = tables.Column() - value = tables.Column() + field = tables.Column( + verbose_name=_('Field'), + ) + value = tables.Column( + verbose_name=_('Value'), + ) trim_length = 30 diff --git a/netbox/tenancy/tables/columns.py b/netbox/tenancy/tables/columns.py index 491d0488f..ec73cac4a 100644 --- a/netbox/tenancy/tables/columns.py +++ b/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 ) diff --git a/netbox/tenancy/tables/contacts.py b/netbox/tenancy/tables/contacts.py index 7de8ffceb..036f2caa2 100644 --- a/netbox/tenancy/tables/contacts.py +++ b/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,43 +87,47 @@ 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( + verbose_name=_('Actions'), actions=('edit', 'delete') ) diff --git a/netbox/tenancy/tables/tenants.py b/netbox/tenancy/tables/tenants.py index 67f69ef5e..a10133a64 100644 --- a/netbox/tenancy/tables/tenants.py +++ b/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' )