From f04e55743bf8102508e712dc5d321a28a4a9fd42 Mon Sep 17 00:00:00 2001 From: Arthur Date: Wed, 26 Jul 2023 12:26:12 +0700 Subject: [PATCH] 13150 internationalize tables --- netbox/users/tables.py | 55 +++++++++++++++---- netbox/virtualization/tables/clusters.py | 23 ++++++-- .../virtualization/tables/virtualmachines.py | 34 +++++++++--- netbox/wireless/tables/wirelesslan.py | 24 ++++++-- netbox/wireless/tables/wirelesslink.py | 11 +++- 5 files changed, 113 insertions(+), 34 deletions(-) diff --git a/netbox/users/tables.py b/netbox/users/tables.py index 3ef885399..b7388ada5 100644 --- a/netbox/users/tables.py +++ b/netbox/users/tables.py @@ -56,6 +56,7 @@ class UserTokenTable(NetBoxTable): template_code=ALLOWED_IPS ) actions = TokenActionsColumn( + verbose_name=_('Actions'), actions=('edit', 'delete'), extra_buttons=COPY_BUTTON ) @@ -85,15 +86,24 @@ class TokenTable(UserTokenTable): class UserTable(NetBoxTable): username = tables.Column( + verbose_name=_('Username'), linkify=True ) groups = columns.ManyToManyColumn( + verbose_name=_('Groups'), linkify_item=('users:netboxgroup', {'pk': tables.A('pk')}) ) - is_active = columns.BooleanColumn() - is_staff = columns.BooleanColumn() - is_superuser = columns.BooleanColumn() + is_active = columns.BooleanColumn( + verbose_name=_('Is active'), + ) + is_staff = columns.BooleanColumn( + verbose_name=_('Is staff'), + ) + is_superuser = columns.BooleanColumn( + verbose_name=_('Is superuser'), + ) actions = columns.ActionsColumn( + verbose_name=_('Actions'), actions=('edit', 'delete'), ) @@ -107,8 +117,12 @@ class UserTable(NetBoxTable): class GroupTable(NetBoxTable): - name = tables.Column(linkify=True) + name = tables.Column( + verbose_name=_('Name'), + linkify=True + ) actions = columns.ActionsColumn( + verbose_name=_('Actions'), actions=('edit', 'delete'), ) @@ -121,23 +135,42 @@ class GroupTable(NetBoxTable): class ObjectPermissionTable(NetBoxTable): - name = tables.Column(linkify=True) - object_types = columns.ContentTypesColumn() - enabled = columns.BooleanColumn() - can_view = columns.BooleanColumn() - can_add = columns.BooleanColumn() - can_change = columns.BooleanColumn() - can_delete = columns.BooleanColumn() + name = tables.Column( + verbose_name=_('Name'), + linkify=True + ) + object_types = columns.ContentTypesColumn( + verbose_name=_('Object types'), + ) + enabled = columns.BooleanColumn( + verbose_name=_('Enabled'), + ) + can_view = columns.BooleanColumn( + verbose_name=_('Can view'), + ) + can_add = columns.BooleanColumn( + verbose_name=_('Can add'), + ) + can_change = columns.BooleanColumn( + verbose_name=_('Can change'), + ) + can_delete = columns.BooleanColumn( + verbose_name=_('Can delete'), + ) custom_actions = columns.ArrayColumn( + verbose_name=_('Custom actions'), accessor=tables.A('actions') ) users = columns.ManyToManyColumn( + verbose_name=_('Users'), linkify_item=('users:netboxuser', {'pk': tables.A('pk')}) ) groups = columns.ManyToManyColumn( + verbose_name=_('Groups'), linkify_item=('users:netboxgroup', {'pk': tables.A('pk')}) ) actions = columns.ActionsColumn( + verbose_name=_('Actions'), actions=('edit', 'delete'), ) diff --git a/netbox/virtualization/tables/clusters.py b/netbox/virtualization/tables/clusters.py index a3e67373d..d3c799fb9 100644 --- a/netbox/virtualization/tables/clusters.py +++ b/netbox/virtualization/tables/clusters.py @@ -1,3 +1,4 @@ +from django.utils.translation import gettext_lazy as _ import django_tables2 as tables from tenancy.tables import ContactsColumnMixin, TenancyColumnsMixin from virtualization.models import Cluster, ClusterGroup, ClusterType @@ -13,12 +14,13 @@ __all__ = ( class ClusterTypeTable(NetBoxTable): name = tables.Column( + verbose_name=_('Name'), linkify=True ) cluster_count = columns.LinkedCountColumn( viewname='virtualization:cluster_list', url_params={'type_id': 'pk'}, - verbose_name='Clusters' + verbose_name=_('Clusters') ) tags = columns.TagColumn( url_name='virtualization:clustertype_list' @@ -34,12 +36,13 @@ class ClusterTypeTable(NetBoxTable): class ClusterGroupTable(ContactsColumnMixin, NetBoxTable): name = tables.Column( + verbose_name=_('Name'), linkify=True ) cluster_count = columns.LinkedCountColumn( viewname='virtualization:cluster_list', url_params={'group_id': 'pk'}, - verbose_name='Clusters' + verbose_name=_('Clusters') ) tags = columns.TagColumn( url_name='virtualization:clustergroup_list' @@ -56,29 +59,37 @@ class ClusterGroupTable(ContactsColumnMixin, NetBoxTable): class ClusterTable(TenancyColumnsMixin, ContactsColumnMixin, NetBoxTable): name = tables.Column( + verbose_name=_('Name'), linkify=True ) type = tables.Column( + verbose_name=_('Type'), linkify=True ) group = tables.Column( + verbose_name=_('Group'), linkify=True ) - status = columns.ChoiceFieldColumn() + status = columns.ChoiceFieldColumn( + verbose_name=_('Status'), + ) site = tables.Column( + verbose_name=_('Site'), linkify=True ) device_count = columns.LinkedCountColumn( viewname='dcim:device_list', url_params={'cluster_id': 'pk'}, - verbose_name='Devices' + verbose_name=_('Devices') ) vm_count = columns.LinkedCountColumn( viewname='virtualization:virtualmachine_list', url_params={'cluster_id': 'pk'}, - verbose_name='VMs' + verbose_name=_('VMs') + ) + comments = columns.MarkdownColumn( + verbose_name=_('Comments'), ) - comments = columns.MarkdownColumn() tags = columns.TagColumn( url_name='virtualization:cluster_list' ) diff --git a/netbox/virtualization/tables/virtualmachines.py b/netbox/virtualization/tables/virtualmachines.py index 03e3a1af6..9a346d263 100644 --- a/netbox/virtualization/tables/virtualmachines.py +++ b/netbox/virtualization/tables/virtualmachines.py @@ -1,5 +1,5 @@ import django_tables2 as tables -from django.utils.translation import gettext as _ +from django.utils.translation import gettext_lazy as _ from dcim.tables.devices import BaseInterfaceTable from netbox.tables import NetBoxTable, columns @@ -12,7 +12,7 @@ __all__ = ( 'VMInterfaceTable', ) -VMINTERFACE_BUTTONS = """ +VMINTERFACE_BUTTONS = _(""" {% if perms.virtualization.change_vminterface %}