From 769d715542b549f454492da3ca009e98571902a0 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 27 Jul 2023 15:02:51 -0400 Subject: [PATCH] Capitalization fixes --- netbox/dcim/tables/devices.py | 24 +++++----- netbox/dcim/tables/devicetypes.py | 22 ++++----- netbox/dcim/tables/modules.py | 4 +- netbox/dcim/tables/power.py | 6 +-- netbox/dcim/tables/racks.py | 2 +- netbox/extras/tables/tables.py | 46 +++++++++---------- netbox/ipam/tables/ip.py | 2 +- netbox/ipam/tables/l2vpn.py | 12 ++--- netbox/ipam/tables/vlans.py | 4 +- netbox/ipam/tables/vrfs.py | 4 +- netbox/users/tables.py | 18 ++++---- .../virtualization/tables/virtualmachines.py | 2 +- netbox/wireless/tables/wirelesslink.py | 8 ++-- 13 files changed, 75 insertions(+), 79 deletions(-) diff --git a/netbox/dcim/tables/devices.py b/netbox/dcim/tables/devices.py index 1c470c456..00226d3f9 100644 --- a/netbox/dcim/tables/devices.py +++ b/netbox/dcim/tables/devices.py @@ -122,7 +122,7 @@ class PlatformTable(NetBoxTable): linkify=True ) config_template = tables.Column( - verbose_name=_('Config template'), + verbose_name=_('Config Template'), linkify=True ) device_count = columns.LinkedCountColumn( @@ -224,7 +224,7 @@ class DeviceTable(TenancyColumnsMixin, ContactsColumnMixin, NetBoxTable): linkify=True ) virtual_chassis = tables.Column( - verbose_name=_('Virtual chassis'), + verbose_name=_('Virtual Chassis'), linkify=True ) vc_position = tables.Column( @@ -234,7 +234,7 @@ class DeviceTable(TenancyColumnsMixin, ContactsColumnMixin, NetBoxTable): verbose_name=_('VC Priority') ) config_template = tables.Column( - verbose_name=_('Config template'), + verbose_name=_('Config Template'), linkify=True ) parent_device = tables.Column( @@ -348,7 +348,7 @@ class DeviceComponentTable(NetBoxTable): class ModularDeviceComponentTable(DeviceComponentTable): module_bay = tables.Column( - verbose_name=_('Module bay'), + verbose_name=_('Module Bay'), accessor=Accessor('module__module_bay'), linkify={ 'viewname': 'dcim:device_modulebays', @@ -378,7 +378,7 @@ class CableTerminationTable(NetBoxTable): verbose_name=_('Link Peers') ) mark_connected = columns.BooleanColumn( - verbose_name=_('Mark connected'), + verbose_name=_('Mark Connected'), ) @@ -537,7 +537,7 @@ class PowerOutletTable(ModularDeviceComponentTable, PathEndpointTable): } ) power_port = tables.Column( - verbose_name=_('Power port'), + verbose_name=_('Power Port'), linkify=True ) tags = columns.TagColumn( @@ -623,7 +623,7 @@ class InterfaceTable(ModularDeviceComponentTable, BaseInterfaceTable, PathEndpoi } ) mgmt_only = columns.BooleanColumn( - verbose_name=_('Mgmt only'), + verbose_name=_('Management Only'), ) wireless_link = tables.Column( verbose_name=_('Wireless link'), @@ -719,7 +719,7 @@ class FrontPortTable(ModularDeviceComponentTable, CableTerminationTable): verbose_name=_('Position') ) rear_port = tables.Column( - verbose_name=_('Rear port'), + verbose_name=_('Rear Port'), linkify=True ) tags = columns.TagColumn( @@ -884,21 +884,21 @@ class ModuleBayTable(DeviceComponentTable): ) installed_module = tables.Column( linkify=True, - verbose_name=_('Installed module') + verbose_name=_('Installed Module') ) module_serial = tables.Column( - verbose_name=_('Module serial'), + verbose_name=_('Module Serial'), accessor=tables.A('installed_module__serial') ) module_asset_tag = tables.Column( - verbose_name=_('Module asset tag'), + verbose_name=_('Module Asset Tag'), accessor=tables.A('installed_module__asset_tag') ) tags = columns.TagColumn( url_name='dcim:modulebay_list' ) module_status = columns.TemplateColumn( - verbose_name=_('Module status'), + verbose_name=_('Module Status'), template_code=MODULEBAY_STATUS ) diff --git a/netbox/dcim/tables/devicetypes.py b/netbox/dcim/tables/devicetypes.py index 18cbcdb29..7631d94d0 100644 --- a/netbox/dcim/tables/devicetypes.py +++ b/netbox/dcim/tables/devicetypes.py @@ -82,7 +82,7 @@ class DeviceTypeTable(NetBoxTable): linkify=True ) default_platform = tables.Column( - verbose_name=_('Default platform'), + verbose_name=_('Default Platform'), linkify=True ) is_full_depth = columns.BooleanColumn( @@ -95,7 +95,7 @@ class DeviceTypeTable(NetBoxTable): url_name='dcim:devicetype_list' ) u_height = columns.TemplateColumn( - verbose_name=_('U height'), + verbose_name=_('U Height'), template_code='{{ value|floatformat }}' ) weight = columns.TemplateColumn( @@ -109,34 +109,34 @@ class DeviceTypeTable(NetBoxTable): verbose_name=_('Instances') ) console_port_template_count = tables.Column( - verbose_name=_('Console ports') + verbose_name=_('Console Ports') ) console_server_port_template_count = tables.Column( - verbose_name=_('Console server ports') + verbose_name=_('Console Server Ports') ) power_port_template_count = tables.Column( - verbose_name=_('Power ports') + verbose_name=_('Power Ports') ) power_outlet_template_count = tables.Column( - verbose_name=_('Power outlets') + verbose_name=_('Power Outlets') ) interface_template_count = tables.Column( verbose_name=_('Interfaces') ) front_port_template_count = tables.Column( - verbose_name=_('Front ports') + verbose_name=_('Front Ports') ) rear_port_template_count = tables.Column( - verbose_name=_('Rear ports') + verbose_name=_('Rear Ports') ) device_bay_template_count = tables.Column( - verbose_name=_('Device bays') + verbose_name=_('Device Bays') ) module_bay_template_count = tables.Column( - verbose_name=_('Module bays') + verbose_name=_('Module Bays') ) inventory_item_template_count = tables.Column( - verbose_name=_('Inventory items') + verbose_name=_('Inventory Items') ) class Meta(NetBoxTable.Meta): diff --git a/netbox/dcim/tables/modules.py b/netbox/dcim/tables/modules.py index 7f5226886..0cd9e438e 100644 --- a/netbox/dcim/tables/modules.py +++ b/netbox/dcim/tables/modules.py @@ -53,7 +53,7 @@ class ModuleTable(NetBoxTable): linkify=True ) module_bay = tables.Column( - verbose_name=_('Module bay'), + verbose_name=_('Module Bay'), linkify=True ) manufacturer = tables.Column( @@ -62,7 +62,7 @@ class ModuleTable(NetBoxTable): linkify=True ) module_type = tables.Column( - verbose_name=_('Module type'), + verbose_name=_('Module Type'), linkify=True ) status = columns.ChoiceFieldColumn( diff --git a/netbox/dcim/tables/power.py b/netbox/dcim/tables/power.py index d8f3be3bb..17ba85878 100644 --- a/netbox/dcim/tables/power.py +++ b/netbox/dcim/tables/power.py @@ -63,7 +63,7 @@ class PowerFeedTable(CableTerminationTable): linkify=True ) power_panel = tables.Column( - verbose_name=_('Power panel'), + verbose_name=_('Power Panel'), linkify=True ) rack = tables.Column( @@ -77,11 +77,11 @@ class PowerFeedTable(CableTerminationTable): verbose_name=_('Type'), ) max_utilization = tables.TemplateColumn( - verbose_name=_('Max utilization'), + verbose_name=_('Max Utilization'), template_code="{{ value }}%" ) available_power = tables.Column( - verbose_name=_('Available power (VA)') + verbose_name=_('Available Power (VA)') ) comments = columns.MarkdownColumn( verbose_name=_('Comments'), diff --git a/netbox/dcim/tables/racks.py b/netbox/dcim/tables/racks.py index 44f4d8101..8610c54c4 100644 --- a/netbox/dcim/tables/racks.py +++ b/netbox/dcim/tables/racks.py @@ -105,7 +105,7 @@ class RackTable(TenancyColumnsMixin, ContactsColumnMixin, NetBoxTable): order_by=('_abs_weight', 'weight_unit') ) max_weight = columns.TemplateColumn( - verbose_name=_('Max weight'), + verbose_name=_('Max Weight'), template_code=WEIGHT, order_by=('_abs_max_weight', 'weight_unit') ) diff --git a/netbox/extras/tables/tables.py b/netbox/extras/tables/tables.py index 09ad3dbe7..5904be077 100644 --- a/netbox/extras/tables/tables.py +++ b/netbox/extras/tables/tables.py @@ -45,7 +45,7 @@ REVISION_BUTTONS = """ class ConfigRevisionTable(NetBoxTable): is_active = columns.BooleanColumn( - verbose_name=_('Is active'), + verbose_name=_('Is Active'), ) actions = columns.ActionsColumn( actions=('delete',), @@ -66,13 +66,13 @@ class CustomFieldTable(NetBoxTable): linkify=True ) content_types = columns.ContentTypesColumn( - verbose_name=_('Content types'), + verbose_name=_('Content Types'), ) required = columns.BooleanColumn( verbose_name=_('Required'), ) ui_visibility = columns.ChoiceFieldColumn( - verbose_name=_("UI visibility") + verbose_name=_("UI Visibility") ) description = columns.MarkdownColumn( verbose_name=_('Description'), @@ -83,7 +83,7 @@ class CustomFieldTable(NetBoxTable): verbose_name=_('Choices') ) is_cloneable = columns.BooleanColumn( - verbose_name=_('Is cloneable'), + verbose_name=_('Is Cloneable'), ) class Meta(NetBoxTable.Meta): @@ -114,7 +114,7 @@ class CustomFieldChoiceSetTable(NetBoxTable): verbose_name=_('Count') ) order_alphabetically = columns.BooleanColumn( - verbose_name=_('Order alphabetically'), + verbose_name=_('Order Alphabetically'), ) class Meta(NetBoxTable.Meta): @@ -132,13 +132,13 @@ class CustomLinkTable(NetBoxTable): linkify=True ) content_types = columns.ContentTypesColumn( - verbose_name=_('Content types'), + verbose_name=_('Content Types'), ) enabled = columns.BooleanColumn( verbose_name=_('Enabled'), ) new_window = columns.BooleanColumn( - verbose_name=_('New window'), + verbose_name=_('New Window'), ) class Meta(NetBoxTable.Meta): @@ -156,17 +156,17 @@ class ExportTemplateTable(NetBoxTable): linkify=True ) content_types = columns.ContentTypesColumn( - verbose_name=_('Content types'), + verbose_name=_('Content Types'), ) as_attachment = columns.BooleanColumn( - verbose_name=_('As attachment'), + verbose_name=_('As Attachment'), ) data_source = tables.Column( - verbose_name=_('Data source'), + verbose_name=_('Data Source'), linkify=True ) data_file = tables.Column( - verbose_name=_('Data file'), + verbose_name=_('Data File'), linkify=True ) is_synced = columns.BooleanColumn( @@ -191,7 +191,7 @@ class ImageAttachmentTable(NetBoxTable): linkify=False ) content_type = columns.ContentTypeColumn( - verbose_name=_('Content type'), + verbose_name=_('Content Type'), ) parent = tables.Column( verbose_name=_('Parent'), @@ -203,7 +203,7 @@ class ImageAttachmentTable(NetBoxTable): ) size = tables.Column( orderable=False, - verbose_name=_('Size (bytes)') + verbose_name=_('Size (Bytes)') ) class Meta(NetBoxTable.Meta): @@ -221,7 +221,7 @@ class SavedFilterTable(NetBoxTable): linkify=True ) content_types = columns.ContentTypesColumn( - verbose_name=_('Content types'), + verbose_name=_('Content Types'), ) enabled = columns.BooleanColumn( verbose_name=_('Enabled'), @@ -246,7 +246,7 @@ class SavedFilterTable(NetBoxTable): class BookmarkTable(NetBoxTable): object_type = columns.ContentTypeColumn( - verbose_name=_('Object types'), + verbose_name=_('Object Types'), ) object = tables.Column( verbose_name=_('Object'), @@ -268,7 +268,7 @@ class WebhookTable(NetBoxTable): linkify=True ) content_types = columns.ContentTypesColumn( - verbose_name=_('Content types'), + verbose_name=_('Content Types'), ) enabled = columns.BooleanColumn( verbose_name=_('Enabled'), @@ -283,10 +283,10 @@ class WebhookTable(NetBoxTable): verbose_name=_('Delete') ) type_job_start = columns.BooleanColumn( - verbose_name=_('Job start') + verbose_name=_('Job Start') ) type_job_end = columns.BooleanColumn( - verbose_name=_('Job end') + verbose_name=_('Job End') ) ssl_validation = columns.BooleanColumn( verbose_name=_('SSL Validation') @@ -314,7 +314,7 @@ class TagTable(NetBoxTable): verbose_name=_('Color'), ) object_types = columns.ContentTypesColumn( - verbose_name=_('Object types'), + verbose_name=_('Object Types'), ) class Meta(NetBoxTable.Meta): @@ -351,11 +351,11 @@ class TaggedItemTable(NetBoxTable): class ConfigContextTable(NetBoxTable): data_source = tables.Column( - verbose_name=_('Data source'), + verbose_name=_('Data Source'), linkify=True ) data_file = tables.Column( - verbose_name=_('Data file'), + verbose_name=_('Data File'), linkify=True ) name = tables.Column( @@ -386,11 +386,11 @@ class ConfigTemplateTable(NetBoxTable): linkify=True ) data_source = tables.Column( - verbose_name=_('Data source'), + verbose_name=_('Data Source'), linkify=True ) data_file = tables.Column( - verbose_name=_('Data file'), + verbose_name=_('Data File'), linkify=True ) is_synced = columns.BooleanColumn( diff --git a/netbox/ipam/tables/ip.py b/netbox/ipam/tables/ip.py index c12fe0929..ae7bcf619 100644 --- a/netbox/ipam/tables/ip.py +++ b/netbox/ipam/tables/ip.py @@ -421,7 +421,7 @@ class IPAddressAssignTable(NetBoxTable): verbose_name=_('Status'), ) assigned_object = tables.Column( - verbose_name=_('Assigned object'), + verbose_name=_('Assigned Object'), orderable=False ) diff --git a/netbox/ipam/tables/l2vpn.py b/netbox/ipam/tables/l2vpn.py index 06c5f1b37..8635ab62a 100644 --- a/netbox/ipam/tables/l2vpn.py +++ b/netbox/ipam/tables/l2vpn.py @@ -18,20 +18,18 @@ L2VPN_TARGETS = """ class L2VPNTable(TenancyColumnsMixin, NetBoxTable): - pk = columns.ToggleColumn( - verbose_name=_('Pk'), - ) + pk = columns.ToggleColumn() name = tables.Column( verbose_name=_('Name'), linkify=True ) import_targets = columns.TemplateColumn( - verbose_name=_('Import targets'), + verbose_name=_('Import Targets'), template_code=L2VPN_TARGETS, orderable=False ) export_targets = columns.TemplateColumn( - verbose_name=_('Export targets'), + verbose_name=_('Export Targets'), template_code=L2VPN_TARGETS, orderable=False ) @@ -52,9 +50,7 @@ class L2VPNTable(TenancyColumnsMixin, NetBoxTable): class L2VPNTerminationTable(NetBoxTable): - pk = columns.ToggleColumn( - verbose_name=_('Pk'), - ) + pk = columns.ToggleColumn() l2vpn = tables.Column( verbose_name=_('L2VPN'), linkify=True diff --git a/netbox/ipam/tables/vlans.py b/netbox/ipam/tables/vlans.py index 04aaaa5fa..83de69d65 100644 --- a/netbox/ipam/tables/vlans.py +++ b/netbox/ipam/tables/vlans.py @@ -65,7 +65,7 @@ class VLANGroupTable(NetBoxTable): linkify=True ) scope_type = columns.ContentTypeColumn( - verbose_name=_('Scope type'), + verbose_name=_('Scope Type'), ) scope = tables.Column( verbose_name=_('Scope'), @@ -188,7 +188,7 @@ class VLANDevicesTable(VLANMembersTable): class VLANVirtualMachinesTable(VLANMembersTable): virtual_machine = tables.Column( - verbose_name=_('Virtual machine'), + verbose_name=_('Virtual Machine'), linkify=True ) actions = columns.ActionsColumn( diff --git a/netbox/ipam/tables/vrfs.py b/netbox/ipam/tables/vrfs.py index 238baadc0..174b99189 100644 --- a/netbox/ipam/tables/vrfs.py +++ b/netbox/ipam/tables/vrfs.py @@ -33,12 +33,12 @@ class VRFTable(TenancyColumnsMixin, NetBoxTable): verbose_name=_('Unique') ) import_targets = columns.TemplateColumn( - verbose_name=_('Import targets'), + verbose_name=_('Import Targets'), template_code=VRF_TARGETS, orderable=False ) export_targets = columns.TemplateColumn( - verbose_name=_('Export targets'), + verbose_name=_('Export Targets'), template_code=VRF_TARGETS, orderable=False ) diff --git a/netbox/users/tables.py b/netbox/users/tables.py index ba7c6edb9..04b0589ff 100644 --- a/netbox/users/tables.py +++ b/netbox/users/tables.py @@ -94,13 +94,13 @@ class UserTable(NetBoxTable): linkify_item=('users:netboxgroup', {'pk': tables.A('pk')}) ) is_active = columns.BooleanColumn( - verbose_name=_('Is active'), + verbose_name=_('Is Active'), ) is_staff = columns.BooleanColumn( - verbose_name=_('Is staff'), + verbose_name=_('Is Staff'), ) is_superuser = columns.BooleanColumn( - verbose_name=_('Is superuser'), + verbose_name=_('Is Superuser'), ) actions = columns.ActionsColumn( actions=('edit', 'delete'), @@ -138,25 +138,25 @@ class ObjectPermissionTable(NetBoxTable): linkify=True ) object_types = columns.ContentTypesColumn( - verbose_name=_('Object types'), + verbose_name=_('Object Types'), ) enabled = columns.BooleanColumn( verbose_name=_('Enabled'), ) can_view = columns.BooleanColumn( - verbose_name=_('Can view'), + verbose_name=_('Can View'), ) can_add = columns.BooleanColumn( - verbose_name=_('Can add'), + verbose_name=_('Can Add'), ) can_change = columns.BooleanColumn( - verbose_name=_('Can change'), + verbose_name=_('Can Change'), ) can_delete = columns.BooleanColumn( - verbose_name=_('Can delete'), + verbose_name=_('Can Delete'), ) custom_actions = columns.ArrayColumn( - verbose_name=_('Custom actions'), + verbose_name=_('Custom Actions'), accessor=tables.A('actions') ) users = columns.ManyToManyColumn( diff --git a/netbox/virtualization/tables/virtualmachines.py b/netbox/virtualization/tables/virtualmachines.py index a2397b067..063811203 100644 --- a/netbox/virtualization/tables/virtualmachines.py +++ b/netbox/virtualization/tables/virtualmachines.py @@ -103,7 +103,7 @@ class VirtualMachineTable(TenancyColumnsMixin, ContactsColumnMixin, NetBoxTable) class VMInterfaceTable(BaseInterfaceTable): virtual_machine = tables.Column( - verbose_name=_('Virtual machine'), + verbose_name=_('Virtual Machine'), linkify=True ) name = tables.Column( diff --git a/netbox/wireless/tables/wirelesslink.py b/netbox/wireless/tables/wirelesslink.py index 95e21f532..7c3b3306b 100644 --- a/netbox/wireless/tables/wirelesslink.py +++ b/netbox/wireless/tables/wirelesslink.py @@ -19,21 +19,21 @@ class WirelessLinkTable(TenancyColumnsMixin, NetBoxTable): verbose_name=_('Status'), ) device_a = tables.Column( - verbose_name=_('Device a'), + verbose_name=_('Device A'), accessor=tables.A('interface_a__device'), linkify=True ) interface_a = tables.Column( - verbose_name=_('Interface a'), + verbose_name=_('Interface A'), linkify=True ) device_b = tables.Column( - verbose_name=_('Device b'), + verbose_name=_('Device B'), accessor=tables.A('interface_b__device'), linkify=True ) interface_b = tables.Column( - verbose_name=_('Interface b'), + verbose_name=_('Interface B'), linkify=True ) tags = columns.TagColumn(