From fc98f68e8aa49ffefe80c1899496ce87101aab72 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 31 Jul 2023 17:10:45 -0400 Subject: [PATCH] Skip translation of standardized identifiers --- netbox/circuits/choices.py | 41 +- netbox/dcim/choices.py | 871 ++++++++++++++++--------------- netbox/extras/choices.py | 13 +- netbox/ipam/choices.py | 73 +-- netbox/tenancy/choices.py | 1 + netbox/utilities/choices.py | 10 +- netbox/virtualization/choices.py | 1 + netbox/wireless/choices.py | 408 +++++++-------- 8 files changed, 713 insertions(+), 705 deletions(-) diff --git a/netbox/circuits/choices.py b/netbox/circuits/choices.py index d9e5c90e5..5d0065edc 100644 --- a/netbox/circuits/choices.py +++ b/netbox/circuits/choices.py @@ -1,4 +1,5 @@ from django.utils.translation import gettext_lazy as _ + from utilities.choices import ChoiceSet @@ -30,15 +31,15 @@ class CircuitCommitRateChoices(ChoiceSet): key = 'Circuit.commit_rate' CHOICES = [ - (10000, _('10 Mbps')), - (100000, _('100 Mbps')), - (1000000, _('1 Gbps')), - (10000000, _('10 Gbps')), - (25000000, _('25 Gbps')), - (40000000, _('40 Gbps')), - (100000000, _('100 Gbps')), - (1544, _('T1 (1.544 Mbps)')), - (2048, _('E1 (2.048 Mbps)')), + (10000, '10 Mbps'), + (100000, '100 Mbps'), + (1000000, '1 Gbps'), + (10000000, '10 Gbps'), + (25000000, '25 Gbps'), + (40000000, '40 Gbps'), + (100000000, '100 Gbps'), + (1544, 'T1 (1.544 Mbps)'), + (2048, 'E1 (2.048 Mbps)'), ] @@ -52,8 +53,8 @@ class CircuitTerminationSideChoices(ChoiceSet): SIDE_Z = 'Z' CHOICES = ( - (SIDE_A, _('A')), - (SIDE_Z, _('Z')) + (SIDE_A, 'A'), + (SIDE_Z, 'Z') ) @@ -61,13 +62,13 @@ class CircuitTerminationPortSpeedChoices(ChoiceSet): key = 'CircuitTermination.port_speed' CHOICES = [ - (10000, _('10 Mbps')), - (100000, _('100 Mbps')), - (1000000, _('1 Gbps')), - (10000000, _('10 Gbps')), - (25000000, _('25 Gbps')), - (40000000, _('40 Gbps')), - (100000000, _('100 Gbps')), - (1544, _('T1 (1.544 Mbps)')), - (2048, _('E1 (2.048 Mbps)')), + (10000, '10 Mbps'), + (100000, '100 Mbps'), + (1000000, '1 Gbps'), + (10000000, '10 Gbps'), + (25000000, '25 Gbps'), + (40000000, '40 Gbps'), + (100000000, '100 Gbps'), + (1544, 'T1 (1.544 Mbps)'), + (2048, 'E1 (2.048 Mbps)'), ] diff --git a/netbox/dcim/choices.py b/netbox/dcim/choices.py index 00cd49a60..30e37e4ce 100644 --- a/netbox/dcim/choices.py +++ b/netbox/dcim/choices.py @@ -1,4 +1,5 @@ from django.utils.translation import gettext_lazy as _ + from utilities.choices import ChoiceSet @@ -38,11 +39,11 @@ class LocationStatusChoices(ChoiceSet): STATUS_RETIRED = 'retired' CHOICES = [ - (STATUS_PLANNED, _('Planned'), 'cyan'), - (STATUS_STAGING, _('Staging'), 'blue'), - (STATUS_ACTIVE, _('Active'), 'green'), - (STATUS_DECOMMISSIONING, _('Decommissioning'), 'yellow'), - (STATUS_RETIRED, _('Retired'), 'red'), + (STATUS_PLANNED, 'Planned', 'cyan'), + (STATUS_STAGING, 'Staging', 'blue'), + (STATUS_ACTIVE, 'Active', 'green'), + (STATUS_DECOMMISSIONING, 'Decommissioning', 'yellow'), + (STATUS_RETIRED, 'Retired', 'red'), ] @@ -121,8 +122,8 @@ class RackElevationDetailRenderChoices(ChoiceSet): RENDER_SVG = 'svg' CHOICES = ( - (RENDER_JSON, _('json')), - (RENDER_SVG, _('svg')) + (RENDER_JSON, 'json'), + (RENDER_SVG, 'svg') ) @@ -246,26 +247,26 @@ class ConsolePortTypeChoices(ChoiceSet): TYPE_OTHER = 'other' CHOICES = ( - (_('Serial'), ( - (TYPE_DE9, _('DE-9')), - (TYPE_DB25, _('DB-25')), - (TYPE_RJ11, _('RJ-11')), - (TYPE_RJ12, _('RJ-12')), - (TYPE_RJ45, _('RJ-45')), - (TYPE_MINI_DIN_8, _('Mini-DIN 8')), + ('Serial', ( + (TYPE_DE9, 'DE-9'), + (TYPE_DB25, 'DB-25'), + (TYPE_RJ11, 'RJ-11'), + (TYPE_RJ12, 'RJ-12'), + (TYPE_RJ45, 'RJ-45'), + (TYPE_MINI_DIN_8, 'Mini-DIN 8'), )), - (_('USB'), ( - (TYPE_USB_A, _('USB Type A')), - (TYPE_USB_B, _('USB Type B')), - (TYPE_USB_C, _('USB Type C')), - (TYPE_USB_MINI_A, _('USB Mini A')), - (TYPE_USB_MINI_B, _('USB Mini B')), - (TYPE_USB_MICRO_A, _('USB Micro A')), - (TYPE_USB_MICRO_B, _('USB Micro B')), - (TYPE_USB_MICRO_AB, _('USB Micro AB')), + ('USB', ( + (TYPE_USB_A, 'USB Type A'), + (TYPE_USB_B, 'USB Type B'), + (TYPE_USB_C, 'USB Type C'), + (TYPE_USB_MINI_A, 'USB Mini A'), + (TYPE_USB_MINI_B, 'USB Mini B'), + (TYPE_USB_MICRO_A, 'USB Micro A'), + (TYPE_USB_MICRO_B, 'USB Micro B'), + (TYPE_USB_MICRO_AB, 'USB Micro AB'), )), - (_('Other'), ( - (TYPE_OTHER, _('Other')), + ('Other', ( + (TYPE_OTHER, 'Other'), )), ) @@ -282,14 +283,14 @@ class ConsolePortSpeedChoices(ChoiceSet): SPEED_115200 = 115200 CHOICES = ( - (SPEED_1200, _('1200 bps')), - (SPEED_2400, _('2400 bps')), - (SPEED_4800, _('4800 bps')), - (SPEED_9600, _('9600 bps')), - (SPEED_19200, _('19.2 kbps')), - (SPEED_38400, _('38.4 kbps')), - (SPEED_57600, _('57.6 kbps')), - (SPEED_115200, _('115.2 kbps')), + (SPEED_1200, '1200 bps'), + (SPEED_2400, '2400 bps'), + (SPEED_4800, '4800 bps'), + (SPEED_9600, '9600 bps'), + (SPEED_19200, '19.2 kbps'), + (SPEED_38400, '38.4 kbps'), + (SPEED_57600, '57.6 kbps'), + (SPEED_115200, '115.2 kbps'), ) @@ -412,127 +413,127 @@ class PowerPortTypeChoices(ChoiceSet): TYPE_OTHER = 'other' CHOICES = ( - (_('IEC 60320'), ( - (TYPE_IEC_C6, _('C6')), - (TYPE_IEC_C8, _('C8')), - (TYPE_IEC_C14, _('C14')), - (TYPE_IEC_C16, _('C16')), - (TYPE_IEC_C20, _('C20')), - (TYPE_IEC_C22, _('C22')), + ('IEC 60320', ( + (TYPE_IEC_C6, 'C6'), + (TYPE_IEC_C8, 'C8'), + (TYPE_IEC_C14, 'C14'), + (TYPE_IEC_C16, 'C16'), + (TYPE_IEC_C20, 'C20'), + (TYPE_IEC_C22, 'C22'), )), - (_('IEC 60309'), ( - (TYPE_IEC_PNE4H, _('P+N+E 4H')), - (TYPE_IEC_PNE6H, _('P+N+E 6H')), - (TYPE_IEC_PNE9H, _('P+N+E 9H')), - (TYPE_IEC_2PE4H, _('2P+E 4H')), - (TYPE_IEC_2PE6H, _('2P+E 6H')), - (TYPE_IEC_2PE9H, _('2P+E 9H')), - (TYPE_IEC_3PE4H, _('3P+E 4H')), - (TYPE_IEC_3PE6H, _('3P+E 6H')), - (TYPE_IEC_3PE9H, _('3P+E 9H')), - (TYPE_IEC_3PNE4H, _('3P+N+E 4H')), - (TYPE_IEC_3PNE6H, _('3P+N+E 6H')), - (TYPE_IEC_3PNE9H, _('3P+N+E 9H')), + ('IEC 60309', ( + (TYPE_IEC_PNE4H, 'P+N+E 4H'), + (TYPE_IEC_PNE6H, 'P+N+E 6H'), + (TYPE_IEC_PNE9H, 'P+N+E 9H'), + (TYPE_IEC_2PE4H, '2P+E 4H'), + (TYPE_IEC_2PE6H, '2P+E 6H'), + (TYPE_IEC_2PE9H, '2P+E 9H'), + (TYPE_IEC_3PE4H, '3P+E 4H'), + (TYPE_IEC_3PE6H, '3P+E 6H'), + (TYPE_IEC_3PE9H, '3P+E 9H'), + (TYPE_IEC_3PNE4H, '3P+N+E 4H'), + (TYPE_IEC_3PNE6H, '3P+N+E 6H'), + (TYPE_IEC_3PNE9H, '3P+N+E 9H'), )), ('IEC 60906-1', ( - (TYPE_IEC_60906_1, _('IEC 60906-1')), - (TYPE_NBR_14136_10A, _('2P+T 10A (NBR 14136)')), - (TYPE_NBR_14136_20A, _('2P+T 20A (NBR 14136)')), + (TYPE_IEC_60906_1, 'IEC 60906-1'), + (TYPE_NBR_14136_10A, '2P+T 10A (NBR 14136)'), + (TYPE_NBR_14136_20A, '2P+T 20A (NBR 14136)'), )), (_('NEMA (Non-locking)'), ( - (TYPE_NEMA_115P, _('NEMA 1-15P')), - (TYPE_NEMA_515P, _('NEMA 5-15P')), - (TYPE_NEMA_520P, _('NEMA 5-20P')), - (TYPE_NEMA_530P, _('NEMA 5-30P')), - (TYPE_NEMA_550P, _('NEMA 5-50P')), - (TYPE_NEMA_615P, _('NEMA 6-15P')), - (TYPE_NEMA_620P, _('NEMA 6-20P')), - (TYPE_NEMA_630P, _('NEMA 6-30P')), - (TYPE_NEMA_650P, _('NEMA 6-50P')), - (TYPE_NEMA_1030P, _('NEMA 10-30P')), - (TYPE_NEMA_1050P, _('NEMA 10-50P')), - (TYPE_NEMA_1420P, _('NEMA 14-20P')), - (TYPE_NEMA_1430P, _('NEMA 14-30P')), - (TYPE_NEMA_1450P, _('NEMA 14-50P')), - (TYPE_NEMA_1460P, _('NEMA 14-60P')), - (TYPE_NEMA_1515P, _('NEMA 15-15P')), - (TYPE_NEMA_1520P, _('NEMA 15-20P')), - (TYPE_NEMA_1530P, _('NEMA 15-30P')), - (TYPE_NEMA_1550P, _('NEMA 15-50P')), - (TYPE_NEMA_1560P, _('NEMA 15-60P')), + (TYPE_NEMA_115P, 'NEMA 1-15P'), + (TYPE_NEMA_515P, 'NEMA 5-15P'), + (TYPE_NEMA_520P, 'NEMA 5-20P'), + (TYPE_NEMA_530P, 'NEMA 5-30P'), + (TYPE_NEMA_550P, 'NEMA 5-50P'), + (TYPE_NEMA_615P, 'NEMA 6-15P'), + (TYPE_NEMA_620P, 'NEMA 6-20P'), + (TYPE_NEMA_630P, 'NEMA 6-30P'), + (TYPE_NEMA_650P, 'NEMA 6-50P'), + (TYPE_NEMA_1030P, 'NEMA 10-30P'), + (TYPE_NEMA_1050P, 'NEMA 10-50P'), + (TYPE_NEMA_1420P, 'NEMA 14-20P'), + (TYPE_NEMA_1430P, 'NEMA 14-30P'), + (TYPE_NEMA_1450P, 'NEMA 14-50P'), + (TYPE_NEMA_1460P, 'NEMA 14-60P'), + (TYPE_NEMA_1515P, 'NEMA 15-15P'), + (TYPE_NEMA_1520P, 'NEMA 15-20P'), + (TYPE_NEMA_1530P, 'NEMA 15-30P'), + (TYPE_NEMA_1550P, 'NEMA 15-50P'), + (TYPE_NEMA_1560P, 'NEMA 15-60P'), )), (_('NEMA (Locking)'), ( - (TYPE_NEMA_L115P, _('NEMA L1-15P')), - (TYPE_NEMA_L515P, _('NEMA L5-15P')), - (TYPE_NEMA_L520P, _('NEMA L5-20P')), - (TYPE_NEMA_L530P, _('NEMA L5-30P')), - (TYPE_NEMA_L550P, _('NEMA L5-50P')), - (TYPE_NEMA_L615P, _('NEMA L6-15P')), - (TYPE_NEMA_L620P, _('NEMA L6-20P')), - (TYPE_NEMA_L630P, _('NEMA L6-30P')), - (TYPE_NEMA_L650P, _('NEMA L6-50P')), - (TYPE_NEMA_L1030P, _('NEMA L10-30P')), - (TYPE_NEMA_L1420P, _('NEMA L14-20P')), - (TYPE_NEMA_L1430P, _('NEMA L14-30P')), - (TYPE_NEMA_L1450P, _('NEMA L14-50P')), - (TYPE_NEMA_L1460P, _('NEMA L14-60P')), - (TYPE_NEMA_L1520P, _('NEMA L15-20P')), - (TYPE_NEMA_L1530P, _('NEMA L15-30P')), - (TYPE_NEMA_L1550P, _('NEMA L15-50P')), - (TYPE_NEMA_L1560P, _('NEMA L15-60P')), - (TYPE_NEMA_L2120P, _('NEMA L21-20P')), - (TYPE_NEMA_L2130P, _('NEMA L21-30P')), - (TYPE_NEMA_L2230P, _('NEMA L22-30P')), + (TYPE_NEMA_L115P, 'NEMA L1-15P'), + (TYPE_NEMA_L515P, 'NEMA L5-15P'), + (TYPE_NEMA_L520P, 'NEMA L5-20P'), + (TYPE_NEMA_L530P, 'NEMA L5-30P'), + (TYPE_NEMA_L550P, 'NEMA L5-50P'), + (TYPE_NEMA_L615P, 'NEMA L6-15P'), + (TYPE_NEMA_L620P, 'NEMA L6-20P'), + (TYPE_NEMA_L630P, 'NEMA L6-30P'), + (TYPE_NEMA_L650P, 'NEMA L6-50P'), + (TYPE_NEMA_L1030P, 'NEMA L10-30P'), + (TYPE_NEMA_L1420P, 'NEMA L14-20P'), + (TYPE_NEMA_L1430P, 'NEMA L14-30P'), + (TYPE_NEMA_L1450P, 'NEMA L14-50P'), + (TYPE_NEMA_L1460P, 'NEMA L14-60P'), + (TYPE_NEMA_L1520P, 'NEMA L15-20P'), + (TYPE_NEMA_L1530P, 'NEMA L15-30P'), + (TYPE_NEMA_L1550P, 'NEMA L15-50P'), + (TYPE_NEMA_L1560P, 'NEMA L15-60P'), + (TYPE_NEMA_L2120P, 'NEMA L21-20P'), + (TYPE_NEMA_L2130P, 'NEMA L21-30P'), + (TYPE_NEMA_L2230P, 'NEMA L22-30P'), )), (_('California Style'), ( - (TYPE_CS6361C, _('CS6361C')), - (TYPE_CS6365C, _('CS6365C')), - (TYPE_CS8165C, _('CS8165C')), - (TYPE_CS8265C, _('CS8265C')), - (TYPE_CS8365C, _('CS8365C')), - (TYPE_CS8465C, _('CS8465C')), + (TYPE_CS6361C, 'CS6361C'), + (TYPE_CS6365C, 'CS6365C'), + (TYPE_CS8165C, 'CS8165C'), + (TYPE_CS8265C, 'CS8265C'), + (TYPE_CS8365C, 'CS8365C'), + (TYPE_CS8465C, 'CS8465C'), )), (_('International/ITA'), ( - (TYPE_ITA_C, _('ITA Type C (CEE 7/16)')), - (TYPE_ITA_E, _('ITA Type E (CEE 7/6)')), - (TYPE_ITA_F, _('ITA Type F (CEE 7/4)')), - (TYPE_ITA_EF, _('ITA Type E/F (CEE 7/7)')), - (TYPE_ITA_G, _('ITA Type G (BS 1363)')), - (TYPE_ITA_H, _('ITA Type H')), - (TYPE_ITA_I, _('ITA Type I')), - (TYPE_ITA_J, _('ITA Type J')), - (TYPE_ITA_K, _('ITA Type K')), - (TYPE_ITA_L, _('ITA Type L (CEI 23-50)')), - (TYPE_ITA_M, _('ITA Type M (BS 546)')), - (TYPE_ITA_N, _('ITA Type N')), - (TYPE_ITA_O, _('ITA Type O')), + (TYPE_ITA_C, 'ITA Type C (CEE 7/16)'), + (TYPE_ITA_E, 'ITA Type E (CEE 7/6)'), + (TYPE_ITA_F, 'ITA Type F (CEE 7/4)'), + (TYPE_ITA_EF, 'ITA Type E/F (CEE 7/7)'), + (TYPE_ITA_G, 'ITA Type G (BS 1363)'), + (TYPE_ITA_H, 'ITA Type H'), + (TYPE_ITA_I, 'ITA Type I'), + (TYPE_ITA_J, 'ITA Type J'), + (TYPE_ITA_K, 'ITA Type K'), + (TYPE_ITA_L, 'ITA Type L (CEI 23-50)'), + (TYPE_ITA_M, 'ITA Type M (BS 546)'), + (TYPE_ITA_N, 'ITA Type N'), + (TYPE_ITA_O, 'ITA Type O'), )), - (_('USB'), ( - (TYPE_USB_A, _('USB Type A')), - (TYPE_USB_B, _('USB Type B')), - (TYPE_USB_C, _('USB Type C')), - (TYPE_USB_MINI_A, _('USB Mini A')), - (TYPE_USB_MINI_B, _('USB Mini B')), - (TYPE_USB_MICRO_A, _('USB Micro A')), - (TYPE_USB_MICRO_B, _('USB Micro B')), - (TYPE_USB_MICRO_AB, _('USB Micro AB')), - (TYPE_USB_3_B, _('USB 3.0 Type B')), - (TYPE_USB_3_MICROB, _('USB 3.0 Micro B')), + ('USB', ( + (TYPE_USB_A, 'USB Type A'), + (TYPE_USB_B, 'USB Type B'), + (TYPE_USB_C, 'USB Type C'), + (TYPE_USB_MINI_A, 'USB Mini A'), + (TYPE_USB_MINI_B, 'USB Mini B'), + (TYPE_USB_MICRO_A, 'USB Micro A'), + (TYPE_USB_MICRO_B, 'USB Micro B'), + (TYPE_USB_MICRO_AB, 'USB Micro AB'), + (TYPE_USB_3_B, 'USB 3.0 Type B'), + (TYPE_USB_3_MICROB, 'USB 3.0 Micro B'), )), - (_('DC'), ( - (TYPE_DC, _('DC Terminal')), + ('DC', ( + (TYPE_DC, 'DC Terminal'), )), (_('Proprietary'), ( - (TYPE_SAF_D_GRID, _('Saf-D-Grid')), - (TYPE_NEUTRIK_POWERCON_20A, _('Neutrik powerCON (20A)')), - (TYPE_NEUTRIK_POWERCON_32A, _('Neutrik powerCON (32A)')), - (TYPE_NEUTRIK_POWERCON_TRUE1, _('Neutrik powerCON TRUE1')), - (TYPE_NEUTRIK_POWERCON_TRUE1_TOP, _('Neutrik powerCON TRUE1 TOP')), - (TYPE_UBIQUITI_SMARTPOWER, _('Ubiquiti SmartPower')), + (TYPE_SAF_D_GRID, 'Saf-D-Grid'), + (TYPE_NEUTRIK_POWERCON_20A, 'Neutrik powerCON (20A)'), + (TYPE_NEUTRIK_POWERCON_32A, 'Neutrik powerCON (32A)'), + (TYPE_NEUTRIK_POWERCON_TRUE1, 'Neutrik powerCON TRUE1'), + (TYPE_NEUTRIK_POWERCON_TRUE1_TOP, 'Neutrik powerCON TRUE1 TOP'), + (TYPE_UBIQUITI_SMARTPOWER, 'Ubiquiti SmartPower'), )), (_('Other'), ( - (TYPE_HARDWIRED, _('Hardwired')), - (TYPE_OTHER, _('Other')), + (TYPE_HARDWIRED, 'Hardwired'), + (TYPE_OTHER, 'Other'), )), ) @@ -649,120 +650,120 @@ class PowerOutletTypeChoices(ChoiceSet): TYPE_OTHER = 'other' CHOICES = ( - (_('IEC 60320'), ( - (TYPE_IEC_C5, _('C5')), - (TYPE_IEC_C7, _('C7')), - (TYPE_IEC_C13, _('C13')), - (TYPE_IEC_C15, _('C15')), - (TYPE_IEC_C19, _('C19')), - (TYPE_IEC_C21, _('C21')), + ('IEC 60320', ( + (TYPE_IEC_C5, 'C5'), + (TYPE_IEC_C7, 'C7'), + (TYPE_IEC_C13, 'C13'), + (TYPE_IEC_C15, 'C15'), + (TYPE_IEC_C19, 'C19'), + (TYPE_IEC_C21, 'C21'), )), - (_('IEC 60309'), ( - (TYPE_IEC_PNE4H, _('P+N+E 4H')), - (TYPE_IEC_PNE6H, _('P+N+E 6H')), - (TYPE_IEC_PNE9H, _('P+N+E 9H')), - (TYPE_IEC_2PE4H, _('2P+E 4H')), - (TYPE_IEC_2PE6H, _('2P+E 6H')), - (TYPE_IEC_2PE9H, _('2P+E 9H')), - (TYPE_IEC_3PE4H, _('3P+E 4H')), - (TYPE_IEC_3PE6H, _('3P+E 6H')), - (TYPE_IEC_3PE9H, _('3P+E 9H')), - (TYPE_IEC_3PNE4H, _('3P+N+E 4H')), - (TYPE_IEC_3PNE6H, _('3P+N+E 6H')), - (TYPE_IEC_3PNE9H, _('3P+N+E 9H')), + ('IEC 60309', ( + (TYPE_IEC_PNE4H, 'P+N+E 4H'), + (TYPE_IEC_PNE6H, 'P+N+E 6H'), + (TYPE_IEC_PNE9H, 'P+N+E 9H'), + (TYPE_IEC_2PE4H, '2P+E 4H'), + (TYPE_IEC_2PE6H, '2P+E 6H'), + (TYPE_IEC_2PE9H, '2P+E 9H'), + (TYPE_IEC_3PE4H, '3P+E 4H'), + (TYPE_IEC_3PE6H, '3P+E 6H'), + (TYPE_IEC_3PE9H, '3P+E 9H'), + (TYPE_IEC_3PNE4H, '3P+N+E 4H'), + (TYPE_IEC_3PNE6H, '3P+N+E 6H'), + (TYPE_IEC_3PNE9H, '3P+N+E 9H'), )), ('IEC 60906-1', ( - (TYPE_IEC_60906_1, _('IEC 60906-1')), - (TYPE_NBR_14136_10A, _('2P+T 10A (NBR 14136)')), - (TYPE_NBR_14136_20A, _('2P+T 20A (NBR 14136)')), + (TYPE_IEC_60906_1, 'IEC 60906-1'), + (TYPE_NBR_14136_10A, '2P+T 10A (NBR 14136)'), + (TYPE_NBR_14136_20A, '2P+T 20A (NBR 14136)'), )), (_('NEMA (Non-locking)'), ( - (TYPE_NEMA_115R, _('NEMA 1-15R')), - (TYPE_NEMA_515R, _('NEMA 5-15R')), - (TYPE_NEMA_520R, _('NEMA 5-20R')), - (TYPE_NEMA_530R, _('NEMA 5-30R')), - (TYPE_NEMA_550R, _('NEMA 5-50R')), - (TYPE_NEMA_615R, _('NEMA 6-15R')), - (TYPE_NEMA_620R, _('NEMA 6-20R')), - (TYPE_NEMA_630R, _('NEMA 6-30R')), - (TYPE_NEMA_650R, _('NEMA 6-50R')), - (TYPE_NEMA_1030R, _('NEMA 10-30R')), - (TYPE_NEMA_1050R, _('NEMA 10-50R')), - (TYPE_NEMA_1420R, _('NEMA 14-20R')), - (TYPE_NEMA_1430R, _('NEMA 14-30R')), - (TYPE_NEMA_1450R, _('NEMA 14-50R')), - (TYPE_NEMA_1460R, _('NEMA 14-60R')), - (TYPE_NEMA_1515R, _('NEMA 15-15R')), - (TYPE_NEMA_1520R, _('NEMA 15-20R')), - (TYPE_NEMA_1530R, _('NEMA 15-30R')), - (TYPE_NEMA_1550R, _('NEMA 15-50R')), - (TYPE_NEMA_1560R, _('NEMA 15-60R')), + (TYPE_NEMA_115R, 'NEMA 1-15R'), + (TYPE_NEMA_515R, 'NEMA 5-15R'), + (TYPE_NEMA_520R, 'NEMA 5-20R'), + (TYPE_NEMA_530R, 'NEMA 5-30R'), + (TYPE_NEMA_550R, 'NEMA 5-50R'), + (TYPE_NEMA_615R, 'NEMA 6-15R'), + (TYPE_NEMA_620R, 'NEMA 6-20R'), + (TYPE_NEMA_630R, 'NEMA 6-30R'), + (TYPE_NEMA_650R, 'NEMA 6-50R'), + (TYPE_NEMA_1030R, 'NEMA 10-30R'), + (TYPE_NEMA_1050R, 'NEMA 10-50R'), + (TYPE_NEMA_1420R, 'NEMA 14-20R'), + (TYPE_NEMA_1430R, 'NEMA 14-30R'), + (TYPE_NEMA_1450R, 'NEMA 14-50R'), + (TYPE_NEMA_1460R, 'NEMA 14-60R'), + (TYPE_NEMA_1515R, 'NEMA 15-15R'), + (TYPE_NEMA_1520R, 'NEMA 15-20R'), + (TYPE_NEMA_1530R, 'NEMA 15-30R'), + (TYPE_NEMA_1550R, 'NEMA 15-50R'), + (TYPE_NEMA_1560R, 'NEMA 15-60R'), )), (_('NEMA (Locking)'), ( - (TYPE_NEMA_L115R, _('NEMA L1-15R')), - (TYPE_NEMA_L515R, _('NEMA L5-15R')), - (TYPE_NEMA_L520R, _('NEMA L5-20R')), - (TYPE_NEMA_L530R, _('NEMA L5-30R')), - (TYPE_NEMA_L550R, _('NEMA L5-50R')), - (TYPE_NEMA_L615R, _('NEMA L6-15R')), - (TYPE_NEMA_L620R, _('NEMA L6-20R')), - (TYPE_NEMA_L630R, _('NEMA L6-30R')), - (TYPE_NEMA_L650R, _('NEMA L6-50R')), - (TYPE_NEMA_L1030R, _('NEMA L10-30R')), - (TYPE_NEMA_L1420R, _('NEMA L14-20R')), - (TYPE_NEMA_L1430R, _('NEMA L14-30R')), - (TYPE_NEMA_L1450R, _('NEMA L14-50R')), - (TYPE_NEMA_L1460R, _('NEMA L14-60R')), - (TYPE_NEMA_L1520R, _('NEMA L15-20R')), - (TYPE_NEMA_L1530R, _('NEMA L15-30R')), - (TYPE_NEMA_L1550R, _('NEMA L15-50R')), - (TYPE_NEMA_L1560R, _('NEMA L15-60R')), - (TYPE_NEMA_L2120R, _('NEMA L21-20R')), - (TYPE_NEMA_L2130R, _('NEMA L21-30R')), - (TYPE_NEMA_L2230R, _('NEMA L22-30R')), + (TYPE_NEMA_L115R, 'NEMA L1-15R'), + (TYPE_NEMA_L515R, 'NEMA L5-15R'), + (TYPE_NEMA_L520R, 'NEMA L5-20R'), + (TYPE_NEMA_L530R, 'NEMA L5-30R'), + (TYPE_NEMA_L550R, 'NEMA L5-50R'), + (TYPE_NEMA_L615R, 'NEMA L6-15R'), + (TYPE_NEMA_L620R, 'NEMA L6-20R'), + (TYPE_NEMA_L630R, 'NEMA L6-30R'), + (TYPE_NEMA_L650R, 'NEMA L6-50R'), + (TYPE_NEMA_L1030R, 'NEMA L10-30R'), + (TYPE_NEMA_L1420R, 'NEMA L14-20R'), + (TYPE_NEMA_L1430R, 'NEMA L14-30R'), + (TYPE_NEMA_L1450R, 'NEMA L14-50R'), + (TYPE_NEMA_L1460R, 'NEMA L14-60R'), + (TYPE_NEMA_L1520R, 'NEMA L15-20R'), + (TYPE_NEMA_L1530R, 'NEMA L15-30R'), + (TYPE_NEMA_L1550R, 'NEMA L15-50R'), + (TYPE_NEMA_L1560R, 'NEMA L15-60R'), + (TYPE_NEMA_L2120R, 'NEMA L21-20R'), + (TYPE_NEMA_L2130R, 'NEMA L21-30R'), + (TYPE_NEMA_L2230R, 'NEMA L22-30R'), )), (_('California Style'), ( - (TYPE_CS6360C, _('CS6360C')), - (TYPE_CS6364C, _('CS6364C')), - (TYPE_CS8164C, _('CS8164C')), - (TYPE_CS8264C, _('CS8264C')), - (TYPE_CS8364C, _('CS8364C')), - (TYPE_CS8464C, _('CS8464C')), + (TYPE_CS6360C, 'CS6360C'), + (TYPE_CS6364C, 'CS6364C'), + (TYPE_CS8164C, 'CS8164C'), + (TYPE_CS8264C, 'CS8264C'), + (TYPE_CS8364C, 'CS8364C'), + (TYPE_CS8464C, 'CS8464C'), )), (_('ITA/International'), ( - (TYPE_ITA_E, _('ITA Type E (CEE 7/5)')), - (TYPE_ITA_F, _('ITA Type F (CEE 7/3)')), - (TYPE_ITA_G, _('ITA Type G (BS 1363)')), - (TYPE_ITA_H, _('ITA Type H')), - (TYPE_ITA_I, _('ITA Type I')), - (TYPE_ITA_J, _('ITA Type J')), - (TYPE_ITA_K, _('ITA Type K')), - (TYPE_ITA_L, _('ITA Type L (CEI 23-50)')), - (TYPE_ITA_M, _('ITA Type M (BS 546)')), - (TYPE_ITA_N, _('ITA Type N')), - (TYPE_ITA_O, _('ITA Type O')), - (TYPE_ITA_MULTISTANDARD, _('ITA Multistandard')), + (TYPE_ITA_E, 'ITA Type E (CEE 7/5)'), + (TYPE_ITA_F, 'ITA Type F (CEE 7/3)'), + (TYPE_ITA_G, 'ITA Type G (BS 1363)'), + (TYPE_ITA_H, 'ITA Type H'), + (TYPE_ITA_I, 'ITA Type I'), + (TYPE_ITA_J, 'ITA Type J'), + (TYPE_ITA_K, 'ITA Type K'), + (TYPE_ITA_L, 'ITA Type L (CEI 23-50)'), + (TYPE_ITA_M, 'ITA Type M (BS 546)'), + (TYPE_ITA_N, 'ITA Type N'), + (TYPE_ITA_O, 'ITA Type O'), + (TYPE_ITA_MULTISTANDARD, 'ITA Multistandard'), )), - (_('USB'), ( - (TYPE_USB_A, _('USB Type A')), - (TYPE_USB_MICROB, _('USB Micro B')), - (TYPE_USB_C, _('USB Type C')), + ('USB', ( + (TYPE_USB_A, 'USB Type A'), + (TYPE_USB_MICROB, 'USB Micro B'), + (TYPE_USB_C, 'USB Type C'), )), - (_('DC'), ( - (TYPE_DC, _('DC Terminal')), + ('DC', ( + (TYPE_DC, 'DC Terminal'), )), (_('Proprietary'), ( - (TYPE_HDOT_CX, _('HDOT Cx')), - (TYPE_SAF_D_GRID, _('Saf-D-Grid')), - (TYPE_NEUTRIK_POWERCON_20A, _('Neutrik powerCON (20A)')), - (TYPE_NEUTRIK_POWERCON_32A, _('Neutrik powerCON (32A)')), - (TYPE_NEUTRIK_POWERCON_TRUE1, _('Neutrik powerCON TRUE1')), - (TYPE_NEUTRIK_POWERCON_TRUE1_TOP, _('Neutrik powerCON TRUE1 TOP')), - (TYPE_UBIQUITI_SMARTPOWER, _('Ubiquiti SmartPower')), + (TYPE_HDOT_CX, 'HDOT Cx'), + (TYPE_SAF_D_GRID, 'Saf-D-Grid'), + (TYPE_NEUTRIK_POWERCON_20A, 'Neutrik powerCON (20A)'), + (TYPE_NEUTRIK_POWERCON_32A, 'Neutrik powerCON (32A)'), + (TYPE_NEUTRIK_POWERCON_TRUE1, 'Neutrik powerCON TRUE1'), + (TYPE_NEUTRIK_POWERCON_TRUE1_TOP, 'Neutrik powerCON TRUE1 TOP'), + (TYPE_UBIQUITI_SMARTPOWER, 'Ubiquiti SmartPower'), )), (_('Other'), ( - (TYPE_HARDWIRED, _('Hardwired')), - (TYPE_OTHER, _('Other')), + (TYPE_HARDWIRED, 'Hardwired'), + (TYPE_OTHER, 'Other'), )), ) @@ -774,9 +775,9 @@ class PowerOutletFeedLegChoices(ChoiceSet): FEED_LEG_C = 'C' CHOICES = ( - (FEED_LEG_A, _('A')), - (FEED_LEG_B, _('B')), - (FEED_LEG_C, _('C')), + (FEED_LEG_A, 'A'), + (FEED_LEG_B, 'B'), + (FEED_LEG_C, 'C'), ) @@ -950,174 +951,174 @@ class InterfaceTypeChoices(ChoiceSet): ( _('Ethernet (fixed)'), ( - (TYPE_100ME_FX, _('100BASE-FX (10/100ME FIBER)')), - (TYPE_100ME_LFX, _('100BASE-LFX (10/100ME FIBER)')), - (TYPE_100ME_FIXED, _('100BASE-TX (10/100ME)')), - (TYPE_100ME_T1, _('100BASE-T1 (10/100ME Single Pair)')), - (TYPE_1GE_FIXED, _('1000BASE-T (1GE)')), - (TYPE_2GE_FIXED, _('2.5GBASE-T (2.5GE)')), - (TYPE_5GE_FIXED, _('5GBASE-T (5GE)')), - (TYPE_10GE_FIXED, _('10GBASE-T (10GE)')), - (TYPE_10GE_CX4, _('10GBASE-CX4 (10GE)')), + (TYPE_100ME_FX, '100BASE-FX (10/100ME FIBER)'), + (TYPE_100ME_LFX, '100BASE-LFX (10/100ME FIBER)'), + (TYPE_100ME_FIXED, '100BASE-TX (10/100ME)'), + (TYPE_100ME_T1, '100BASE-T1 (10/100ME Single Pair)'), + (TYPE_1GE_FIXED, '1000BASE-T (1GE)'), + (TYPE_2GE_FIXED, '2.5GBASE-T (2.5GE)'), + (TYPE_5GE_FIXED, '5GBASE-T (5GE)'), + (TYPE_10GE_FIXED, '10GBASE-T (10GE)'), + (TYPE_10GE_CX4, '10GBASE-CX4 (10GE)'), ) ), ( _('Ethernet (modular)'), ( - (TYPE_1GE_GBIC, _('GBIC (1GE)')), - (TYPE_1GE_SFP, _('SFP (1GE)')), - (TYPE_10GE_SFP_PLUS, _('SFP+ (10GE)')), - (TYPE_10GE_XFP, _('XFP (10GE)')), - (TYPE_10GE_XENPAK, _('XENPAK (10GE)')), - (TYPE_10GE_X2, _('X2 (10GE)')), - (TYPE_25GE_SFP28, _('SFP28 (25GE)')), - (TYPE_50GE_SFP56, _('SFP56 (50GE)')), - (TYPE_40GE_QSFP_PLUS, _('QSFP+ (40GE)')), - (TYPE_50GE_QSFP28, _('QSFP28 (50GE)')), - (TYPE_100GE_CFP, _('CFP (100GE)')), - (TYPE_100GE_CFP2, _('CFP2 (100GE)')), - (TYPE_200GE_CFP2, _('CFP2 (200GE)')), - (TYPE_100GE_CFP4, _('CFP4 (100GE)')), - (TYPE_100GE_CXP, _('CXP (100GE)')), - (TYPE_100GE_CPAK, _('Cisco CPAK (100GE)')), - (TYPE_100GE_DSFP, _('DSFP (100GE)')), - (TYPE_100GE_SFP_DD, _('SFP-DD (100GE)')), - (TYPE_100GE_QSFP28, _('QSFP28 (100GE)')), - (TYPE_100GE_QSFP_DD, _('QSFP-DD (100GE)')), - (TYPE_200GE_QSFP56, _('QSFP56 (200GE)')), - (TYPE_200GE_QSFP_DD, _('QSFP-DD (200GE)')), - (TYPE_400GE_QSFP_DD, _('QSFP-DD (400GE)')), - (TYPE_400GE_OSFP, _('OSFP (400GE)')), - (TYPE_400GE_CDFP, _('CDFP (400GE)')), - (TYPE_400GE_CFP8, _('CPF8 (400GE)')), - (TYPE_800GE_QSFP_DD, _('QSFP-DD (800GE)')), - (TYPE_800GE_OSFP, _('OSFP (800GE)')), + (TYPE_1GE_GBIC, 'GBIC (1GE)'), + (TYPE_1GE_SFP, 'SFP (1GE)'), + (TYPE_10GE_SFP_PLUS, 'SFP+ (10GE)'), + (TYPE_10GE_XFP, 'XFP (10GE)'), + (TYPE_10GE_XENPAK, 'XENPAK (10GE)'), + (TYPE_10GE_X2, 'X2 (10GE)'), + (TYPE_25GE_SFP28, 'SFP28 (25GE)'), + (TYPE_50GE_SFP56, 'SFP56 (50GE)'), + (TYPE_40GE_QSFP_PLUS, 'QSFP+ (40GE)'), + (TYPE_50GE_QSFP28, 'QSFP28 (50GE)'), + (TYPE_100GE_CFP, 'CFP (100GE)'), + (TYPE_100GE_CFP2, 'CFP2 (100GE)'), + (TYPE_200GE_CFP2, 'CFP2 (200GE)'), + (TYPE_100GE_CFP4, 'CFP4 (100GE)'), + (TYPE_100GE_CXP, 'CXP (100GE)'), + (TYPE_100GE_CPAK, 'Cisco CPAK (100GE)'), + (TYPE_100GE_DSFP, 'DSFP (100GE)'), + (TYPE_100GE_SFP_DD, 'SFP-DD (100GE)'), + (TYPE_100GE_QSFP28, 'QSFP28 (100GE)'), + (TYPE_100GE_QSFP_DD, 'QSFP-DD (100GE)'), + (TYPE_200GE_QSFP56, 'QSFP56 (200GE)'), + (TYPE_200GE_QSFP_DD, 'QSFP-DD (200GE)'), + (TYPE_400GE_QSFP_DD, 'QSFP-DD (400GE)'), + (TYPE_400GE_OSFP, 'OSFP (400GE)'), + (TYPE_400GE_CDFP, 'CDFP (400GE)'), + (TYPE_400GE_CFP8, 'CPF8 (400GE)'), + (TYPE_800GE_QSFP_DD, 'QSFP-DD (800GE)'), + (TYPE_800GE_OSFP, 'OSFP (800GE)'), ) ), ( _('Ethernet (backplane)'), ( - (TYPE_1GE_KX, _('1000BASE-KX (1GE)')), - (TYPE_10GE_KR, _('10GBASE-KR (10GE)')), - (TYPE_10GE_KX4, _('10GBASE-KX4 (10GE)')), - (TYPE_25GE_KR, _('25GBASE-KR (25GE)')), - (TYPE_40GE_KR4, _('40GBASE-KR4 (40GE)')), - (TYPE_50GE_KR, _('50GBASE-KR (50GE)')), - (TYPE_100GE_KP4, _('100GBASE-KP4 (100GE)')), - (TYPE_100GE_KR2, _('100GBASE-KR2 (100GE)')), - (TYPE_100GE_KR4, _('100GBASE-KR4 (100GE)')), + (TYPE_1GE_KX, '1000BASE-KX (1GE)'), + (TYPE_10GE_KR, '10GBASE-KR (10GE)'), + (TYPE_10GE_KX4, '10GBASE-KX4 (10GE)'), + (TYPE_25GE_KR, '25GBASE-KR (25GE)'), + (TYPE_40GE_KR4, '40GBASE-KR4 (40GE)'), + (TYPE_50GE_KR, '50GBASE-KR (50GE)'), + (TYPE_100GE_KP4, '100GBASE-KP4 (100GE)'), + (TYPE_100GE_KR2, '100GBASE-KR2 (100GE)'), + (TYPE_100GE_KR4, '100GBASE-KR4 (100GE)'), ) ), ( _('Wireless'), ( - (TYPE_80211A, _('IEEE 802.11a')), - (TYPE_80211G, _('IEEE 802.11b/g')), - (TYPE_80211N, _('IEEE 802.11n')), - (TYPE_80211AC, _('IEEE 802.11ac')), - (TYPE_80211AD, _('IEEE 802.11ad')), - (TYPE_80211AX, _('IEEE 802.11ax')), - (TYPE_80211AY, _('IEEE 802.11ay')), - (TYPE_802151, _('IEEE 802.15.1 (Bluetooth)')), - (TYPE_OTHER_WIRELESS, _('Other (Wireless)')), + (TYPE_80211A, 'IEEE 802.11a'), + (TYPE_80211G, 'IEEE 802.11b/g'), + (TYPE_80211N, 'IEEE 802.11n'), + (TYPE_80211AC, 'IEEE 802.11ac'), + (TYPE_80211AD, 'IEEE 802.11ad'), + (TYPE_80211AX, 'IEEE 802.11ax'), + (TYPE_80211AY, 'IEEE 802.11ay'), + (TYPE_802151, 'IEEE 802.15.1 (Bluetooth)'), + (TYPE_OTHER_WIRELESS, 'Other (Wireless)'), ) ), ( _('Cellular'), ( - (TYPE_GSM, _('GSM')), - (TYPE_CDMA, _('CDMA')), - (TYPE_LTE, _('LTE')), + (TYPE_GSM, 'GSM'), + (TYPE_CDMA, 'CDMA'), + (TYPE_LTE, 'LTE'), ) ), ( - _('SONET'), + 'SONET', ( - (TYPE_SONET_OC3, _('OC-3/STM-1')), - (TYPE_SONET_OC12, _('OC-12/STM-4')), - (TYPE_SONET_OC48, _('OC-48/STM-16')), - (TYPE_SONET_OC192, _('OC-192/STM-64')), - (TYPE_SONET_OC768, _('OC-768/STM-256')), - (TYPE_SONET_OC1920, _('OC-1920/STM-640')), - (TYPE_SONET_OC3840, _('OC-3840/STM-1234')), + (TYPE_SONET_OC3, 'OC-3/STM-1'), + (TYPE_SONET_OC12, 'OC-12/STM-4'), + (TYPE_SONET_OC48, 'OC-48/STM-16'), + (TYPE_SONET_OC192, 'OC-192/STM-64'), + (TYPE_SONET_OC768, 'OC-768/STM-256'), + (TYPE_SONET_OC1920, 'OC-1920/STM-640'), + (TYPE_SONET_OC3840, 'OC-3840/STM-1234'), ) ), ( - _('FibreChannel'), + 'FibreChannel', ( - (TYPE_1GFC_SFP, _('SFP (1GFC)')), - (TYPE_2GFC_SFP, _('SFP (2GFC)')), - (TYPE_4GFC_SFP, _('SFP (4GFC)')), - (TYPE_8GFC_SFP_PLUS, _('SFP+ (8GFC)')), - (TYPE_16GFC_SFP_PLUS, _('SFP+ (16GFC)')), - (TYPE_32GFC_SFP28, _('SFP28 (32GFC)')), - (TYPE_64GFC_QSFP_PLUS, _('QSFP+ (64GFC)')), - (TYPE_128GFC_QSFP28, _('QSFP28 (128GFC)')), + (TYPE_1GFC_SFP, 'SFP (1GFC)'), + (TYPE_2GFC_SFP, 'SFP (2GFC)'), + (TYPE_4GFC_SFP, 'SFP (4GFC)'), + (TYPE_8GFC_SFP_PLUS, 'SFP+ (8GFC)'), + (TYPE_16GFC_SFP_PLUS, 'SFP+ (16GFC)'), + (TYPE_32GFC_SFP28, 'SFP28 (32GFC)'), + (TYPE_64GFC_QSFP_PLUS, 'QSFP+ (64GFC)'), + (TYPE_128GFC_QSFP28, 'QSFP28 (128GFC)'), ) ), ( - _('InfiniBand'), + 'InfiniBand', ( - (TYPE_INFINIBAND_SDR, _('SDR (2 Gbps)')), - (TYPE_INFINIBAND_DDR, _('DDR (4 Gbps)')), - (TYPE_INFINIBAND_QDR, _('QDR (8 Gbps)')), - (TYPE_INFINIBAND_FDR10, _('FDR10 (10 Gbps)')), - (TYPE_INFINIBAND_FDR, _('FDR (13.5 Gbps)')), - (TYPE_INFINIBAND_EDR, _('EDR (25 Gbps)')), - (TYPE_INFINIBAND_HDR, _('HDR (50 Gbps)')), - (TYPE_INFINIBAND_NDR, _('NDR (100 Gbps)')), - (TYPE_INFINIBAND_XDR, _('XDR (250 Gbps)')), + (TYPE_INFINIBAND_SDR, 'SDR (2 Gbps)'), + (TYPE_INFINIBAND_DDR, 'DDR (4 Gbps)'), + (TYPE_INFINIBAND_QDR, 'QDR (8 Gbps)'), + (TYPE_INFINIBAND_FDR10, 'FDR10 (10 Gbps)'), + (TYPE_INFINIBAND_FDR, 'FDR (13.5 Gbps)'), + (TYPE_INFINIBAND_EDR, 'EDR (25 Gbps)'), + (TYPE_INFINIBAND_HDR, 'HDR (50 Gbps)'), + (TYPE_INFINIBAND_NDR, 'NDR (100 Gbps)'), + (TYPE_INFINIBAND_XDR, 'XDR (250 Gbps)'), ) ), ( _('Serial'), ( - (TYPE_T1, _('T1 (1.544 Mbps)')), - (TYPE_E1, _('E1 (2.048 Mbps)')), - (TYPE_T3, _('T3 (45 Mbps)')), - (TYPE_E3, _('E3 (34 Mbps)')), + (TYPE_T1, 'T1 (1.544 Mbps)'), + (TYPE_E1, 'E1 (2.048 Mbps)'), + (TYPE_T3, 'T3 (45 Mbps)'), + (TYPE_E3, 'E3 (34 Mbps)'), ) ), ( - _('ATM'), + 'ATM', ( - (TYPE_XDSL, _('xDSL')), + (TYPE_XDSL, 'xDSL'), ) ), ( _('Coaxial'), ( - (TYPE_DOCSIS, _('DOCSIS')), + (TYPE_DOCSIS, 'DOCSIS'), ) ), ( - _('PON'), + 'PON', ( - (TYPE_GPON, _('GPON (2.5 Gbps / 1.25 Gps)')), - (TYPE_XG_PON, _('XG-PON (10 Gbps / 2.5 Gbps)')), - (TYPE_XGS_PON, _('XGS-PON (10 Gbps)')), - (TYPE_NG_PON2, _('NG-PON2 (TWDM-PON) (4x10 Gbps)')), - (TYPE_EPON, _('EPON (1 Gbps)')), - (TYPE_10G_EPON, _('10G-EPON (10 Gbps)')), + (TYPE_GPON, 'GPON (2.5 Gbps / 1.25 Gps)'), + (TYPE_XG_PON, 'XG-PON (10 Gbps / 2.5 Gbps)'), + (TYPE_XGS_PON, 'XGS-PON (10 Gbps)'), + (TYPE_NG_PON2, 'NG-PON2 (TWDM-PON) (4x10 Gbps)'), + (TYPE_EPON, 'EPON (1 Gbps)'), + (TYPE_10G_EPON, '10G-EPON (10 Gbps)'), ) ), ( _('Stacking'), ( - (TYPE_STACKWISE, _('Cisco StackWise')), - (TYPE_STACKWISE_PLUS, _('Cisco StackWise Plus')), - (TYPE_FLEXSTACK, _('Cisco FlexStack')), - (TYPE_FLEXSTACK_PLUS, _('Cisco FlexStack Plus')), - (TYPE_STACKWISE80, _('Cisco StackWise-80')), - (TYPE_STACKWISE160, _('Cisco StackWise-160')), - (TYPE_STACKWISE320, _('Cisco StackWise-320')), - (TYPE_STACKWISE480, _('Cisco StackWise-480')), - (TYPE_STACKWISE1T, _('Cisco StackWise-1T')), - (TYPE_JUNIPER_VCP, _('Juniper VCP')), - (TYPE_SUMMITSTACK, _('Extreme SummitStack')), - (TYPE_SUMMITSTACK128, _('Extreme SummitStack-128')), - (TYPE_SUMMITSTACK256, _('Extreme SummitStack-256')), - (TYPE_SUMMITSTACK512, _('Extreme SummitStack-512')), + (TYPE_STACKWISE, 'Cisco StackWise'), + (TYPE_STACKWISE_PLUS, 'Cisco StackWise Plus'), + (TYPE_FLEXSTACK, 'Cisco FlexStack'), + (TYPE_FLEXSTACK_PLUS, 'Cisco FlexStack Plus'), + (TYPE_STACKWISE80, 'Cisco StackWise-80'), + (TYPE_STACKWISE160, 'Cisco StackWise-160'), + (TYPE_STACKWISE320, 'Cisco StackWise-320'), + (TYPE_STACKWISE480, 'Cisco StackWise-480'), + (TYPE_STACKWISE1T, 'Cisco StackWise-1T'), + (TYPE_JUNIPER_VCP, 'Juniper VCP'), + (TYPE_SUMMITSTACK, 'Extreme SummitStack'), + (TYPE_SUMMITSTACK128, 'Extreme SummitStack-128'), + (TYPE_SUMMITSTACK256, 'Extreme SummitStack-256'), + (TYPE_SUMMITSTACK512, 'Extreme SummitStack-512'), ) ), ( @@ -1133,13 +1134,13 @@ class InterfaceSpeedChoices(ChoiceSet): key = 'Interface.speed' CHOICES = [ - (10000, _('10 Mbps')), - (100000, _('100 Mbps')), - (1000000, _('1 Gbps')), - (10000000, _('10 Gbps')), - (25000000, _('25 Gbps')), - (40000000, _('40 Gbps')), - (100000000, _('100 Gbps')), + (10000, '10 Mbps'), + (100000, '100 Mbps'), + (1000000, '1 Gbps'), + (10000000, '10 Gbps'), + (25000000, '25 Gbps'), + (40000000, '40 Gbps'), + (100000000, '100 Gbps'), ] @@ -1175,8 +1176,8 @@ class InterfacePoEModeChoices(ChoiceSet): MODE_PSE = 'pse' CHOICES = ( - (MODE_PD, _('PD')), - (MODE_PSE, _('PSE')), + (MODE_PD, 'PD'), + (MODE_PSE, 'PSE'), ) @@ -1196,10 +1197,10 @@ class InterfacePoETypeChoices(ChoiceSet): ( _('IEEE Standard'), ( - (TYPE_1_8023AF, _('802.3af (Type 1)')), - (TYPE_2_8023AT, _('802.3at (Type 2)')), - (TYPE_3_8023BT, _('802.3bt (Type 3)')), - (TYPE_4_8023BT, _('802.3bt (Type 4)')), + (TYPE_1_8023AF, '802.3af (Type 1)'), + (TYPE_2_8023AT, '802.3at (Type 2)'), + (TYPE_3_8023BT, '802.3bt (Type 3)'), + (TYPE_4_8023BT, '802.3bt (Type 4)'), ) ), ( @@ -1272,57 +1273,57 @@ class PortTypeChoices(ChoiceSet): ( _('Copper'), ( - (TYPE_8P8C, _('8P8C')), - (TYPE_8P6C, _('8P6C')), - (TYPE_8P4C, _('8P4C')), - (TYPE_8P2C, _('8P2C')), - (TYPE_6P6C, _('6P6C')), - (TYPE_6P4C, _('6P4C')), - (TYPE_6P2C, _('6P2C')), - (TYPE_4P4C, _('4P4C')), - (TYPE_4P2C, _('4P2C')), - (TYPE_GG45, _('GG45')), - (TYPE_TERA4P, _('TERA 4P')), - (TYPE_TERA2P, _('TERA 2P')), - (TYPE_TERA1P, _('TERA 1P')), - (TYPE_110_PUNCH, _('110 Punch')), - (TYPE_BNC, _('BNC')), - (TYPE_F, _('F Connector')), - (TYPE_N, _('N Connector')), - (TYPE_MRJ21, _('MRJ21')), + (TYPE_8P8C, '8P8C'), + (TYPE_8P6C, '8P6C'), + (TYPE_8P4C, '8P4C'), + (TYPE_8P2C, '8P2C'), + (TYPE_6P6C, '6P6C'), + (TYPE_6P4C, '6P4C'), + (TYPE_6P2C, '6P2C'), + (TYPE_4P4C, '4P4C'), + (TYPE_4P2C, '4P2C'), + (TYPE_GG45, 'GG45'), + (TYPE_TERA4P, 'TERA 4P'), + (TYPE_TERA2P, 'TERA 2P'), + (TYPE_TERA1P, 'TERA 1P'), + (TYPE_110_PUNCH, '110 Punch'), + (TYPE_BNC, 'BNC'), + (TYPE_F, 'F Connector'), + (TYPE_N, 'N Connector'), + (TYPE_MRJ21, 'MRJ21'), ), ), ( _('Fiber Optic'), ( - (TYPE_FC, _('FC')), - (TYPE_LC, _('LC')), - (TYPE_LC_PC, _('LC/PC')), - (TYPE_LC_UPC, _('LC/UPC')), - (TYPE_LC_APC, _('LC/APC')), - (TYPE_LSH, _('LSH')), - (TYPE_LSH_PC, _('LSH/PC')), - (TYPE_LSH_UPC, _('LSH/UPC')), - (TYPE_LSH_APC, _('LSH/APC')), - (TYPE_LX5, _('LX.5')), - (TYPE_LX5_PC, _('LX.5/PC')), - (TYPE_LX5_UPC, _('LX.5/UPC')), - (TYPE_LX5_APC, _('LX.5/APC')), - (TYPE_MPO, _('MPO')), - (TYPE_MTRJ, _('MTRJ')), - (TYPE_SC, _('SC')), - (TYPE_SC_PC, _('SC/PC')), - (TYPE_SC_UPC, _('SC/UPC')), - (TYPE_SC_APC, _('SC/APC')), - (TYPE_ST, _('ST')), - (TYPE_CS, _('CS')), - (TYPE_SN, _('SN')), - (TYPE_SMA_905, _('SMA 905')), - (TYPE_SMA_906, _('SMA 906')), - (TYPE_URM_P2, _('URM-P2')), - (TYPE_URM_P4, _('URM-P4')), - (TYPE_URM_P8, _('URM-P8')), - (TYPE_SPLICE, _('Splice')), + (TYPE_FC, 'FC'), + (TYPE_LC, 'LC'), + (TYPE_LC_PC, 'LC/PC'), + (TYPE_LC_UPC, 'LC/UPC'), + (TYPE_LC_APC, 'LC/APC'), + (TYPE_LSH, 'LSH'), + (TYPE_LSH_PC, 'LSH/PC'), + (TYPE_LSH_UPC, 'LSH/UPC'), + (TYPE_LSH_APC, 'LSH/APC'), + (TYPE_LX5, 'LX.5'), + (TYPE_LX5_PC, 'LX.5/PC'), + (TYPE_LX5_UPC, 'LX.5/UPC'), + (TYPE_LX5_APC, 'LX.5/APC'), + (TYPE_MPO, 'MPO'), + (TYPE_MTRJ, 'MTRJ'), + (TYPE_SC, 'SC'), + (TYPE_SC_PC, 'SC/PC'), + (TYPE_SC_UPC, 'SC/UPC'), + (TYPE_SC_APC, 'SC/APC'), + (TYPE_ST, 'ST'), + (TYPE_CS, 'CS'), + (TYPE_SN, 'SN'), + (TYPE_SMA_905, 'SMA 905'), + (TYPE_SMA_906, 'SMA 906'), + (TYPE_URM_P2, 'URM-P2'), + (TYPE_URM_P4, 'URM-P4'), + (TYPE_URM_P8, 'URM-P8'), + (TYPE_SPLICE, 'Splice'), ), ), ( @@ -1367,32 +1368,32 @@ class CableTypeChoices(ChoiceSet): CHOICES = ( ( _('Copper'), ( - (TYPE_CAT3, _('CAT3')), - (TYPE_CAT5, _('CAT5')), - (TYPE_CAT5E, _('CAT5e')), - (TYPE_CAT6, _('CAT6')), - (TYPE_CAT6A, _('CAT6a')), - (TYPE_CAT7, _('CAT7')), - (TYPE_CAT7A, _('CAT7a')), - (TYPE_CAT8, _('CAT8')), - (TYPE_DAC_ACTIVE, _('Direct Attach Copper (Active)')), - (TYPE_DAC_PASSIVE, _('Direct Attach Copper (Passive)')), - (TYPE_MRJ21_TRUNK, _('MRJ21 Trunk')), - (TYPE_COAXIAL, _('Coaxial')), + (TYPE_CAT3, 'CAT3'), + (TYPE_CAT5, 'CAT5'), + (TYPE_CAT5E, 'CAT5e'), + (TYPE_CAT6, 'CAT6'), + (TYPE_CAT6A, 'CAT6a'), + (TYPE_CAT7, 'CAT7'), + (TYPE_CAT7A, 'CAT7a'), + (TYPE_CAT8, 'CAT8'), + (TYPE_DAC_ACTIVE, 'Direct Attach Copper (Active)'), + (TYPE_DAC_PASSIVE, 'Direct Attach Copper (Passive)'), + (TYPE_MRJ21_TRUNK, 'MRJ21 Trunk'), + (TYPE_COAXIAL, 'Coaxial'), ), ), ( _('Fiber'), ( - (TYPE_MMF, _('Multimode Fiber')), - (TYPE_MMF_OM1, _('Multimode Fiber (OM1)')), - (TYPE_MMF_OM2, _('Multimode Fiber (OM2)')), - (TYPE_MMF_OM3, _('Multimode Fiber (OM3)')), - (TYPE_MMF_OM4, _('Multimode Fiber (OM4)')), - (TYPE_MMF_OM5, _('Multimode Fiber (OM5)')), - (TYPE_SMF, _('Singlemode Fiber')), - (TYPE_SMF_OS1, _('Singlemode Fiber (OS1)')), - (TYPE_SMF_OS2, _('Singlemode Fiber (OS2)')), - (TYPE_AOC, _('Active Optical Cabling (AOC)')), + (TYPE_MMF, 'Multimode Fiber'), + (TYPE_MMF_OM1, 'Multimode Fiber (OM1)'), + (TYPE_MMF_OM2, 'Multimode Fiber (OM2)'), + (TYPE_MMF_OM3, 'Multimode Fiber (OM3)'), + (TYPE_MMF_OM4, 'Multimode Fiber (OM4)'), + (TYPE_MMF_OM5, 'Multimode Fiber (OM5)'), + (TYPE_SMF, 'Singlemode Fiber'), + (TYPE_SMF_OS1, 'Singlemode Fiber (OS1)'), + (TYPE_SMF_OS2, 'Singlemode Fiber (OS2)'), + (TYPE_AOC, 'Active Optical Cabling (AOC)'), ), ), (TYPE_POWER, _('Power')), @@ -1462,8 +1463,8 @@ class CableEndChoices(ChoiceSet): SIDE_B = 'B' CHOICES = ( - (SIDE_A, _('A')), - (SIDE_B, _('B')), + (SIDE_A, 'A'), + (SIDE_B, 'B'), # ('', ''), ) @@ -1505,8 +1506,8 @@ class PowerFeedSupplyChoices(ChoiceSet): SUPPLY_DC = 'dc' CHOICES = ( - (SUPPLY_AC, _('AC')), - (SUPPLY_DC, _('DC')), + (SUPPLY_AC, 'AC'), + (SUPPLY_DC, 'DC'), ) diff --git a/netbox/extras/choices.py b/netbox/extras/choices.py index 5f2701ad5..1061bf871 100644 --- a/netbox/extras/choices.py +++ b/netbox/extras/choices.py @@ -1,4 +1,5 @@ from django.utils.translation import gettext_lazy as _ + from utilities.choices import ButtonColorChoices, ChoiceSet @@ -60,7 +61,7 @@ class CustomFieldVisibilityChoices(ChoiceSet): VISIBILITY_HIDDEN_IFUNSET = 'hidden-ifunset' CHOICES = ( - (VISIBILITY_READ_WRITE, _('Read/Write')), + (VISIBILITY_READ_WRITE, _('Read/write')), (VISIBILITY_READ_ONLY, _('Read-only')), (VISIBILITY_HIDDEN, _('Hidden')), (VISIBILITY_HIDDEN_IFUNSET, _('Hidden (if unset)')), @@ -220,11 +221,11 @@ class WebhookHttpMethodChoices(ChoiceSet): METHOD_DELETE = 'DELETE' CHOICES = ( - (METHOD_GET, _('GET')), - (METHOD_POST, _('POST')), - (METHOD_PUT, _('PUT')), - (METHOD_PATCH, _('PATCH')), - (METHOD_DELETE, _('DELETE')), + (METHOD_GET, 'GET'), + (METHOD_POST, 'POST'), + (METHOD_PUT, 'PUT'), + (METHOD_PATCH, 'PATCH'), + (METHOD_DELETE, 'DELETE'), ) diff --git a/netbox/ipam/choices.py b/netbox/ipam/choices.py index 16fbd80da..436cbd040 100644 --- a/netbox/ipam/choices.py +++ b/netbox/ipam/choices.py @@ -1,4 +1,5 @@ from django.utils.translation import gettext_lazy as _ + from utilities.choices import ChoiceSet @@ -8,8 +9,8 @@ class IPAddressFamilyChoices(ChoiceSet): FAMILY_6 = 6 CHOICES = ( - (FAMILY_4, _('IPv4')), - (FAMILY_6, _('IPv6')), + (FAMILY_4, 'IPv4'), + (FAMILY_6, 'IPv6'), ) @@ -88,11 +89,11 @@ class IPAddressRoleChoices(ChoiceSet): (ROLE_LOOPBACK, _('Loopback'), 'gray'), (ROLE_SECONDARY, _('Secondary'), 'blue'), (ROLE_ANYCAST, _('Anycast'), 'yellow'), - (ROLE_VIP, _('VIP'), 'purple'), - (ROLE_VRRP, _('VRRP'), 'green'), - (ROLE_HSRP, _('HSRP'), 'green'), - (ROLE_GLBP, _('GLBP'), 'green'), - (ROLE_CARP, _('CARP'), 'green'), + (ROLE_VIP, 'VIP', 'purple'), + (ROLE_VRRP, 'VRRP', 'green'), + (ROLE_HSRP, 'HSRP', 'green'), + (ROLE_GLBP, 'GLBP', 'green'), + (ROLE_CARP, 'CARP', 'green'), ) @@ -112,18 +113,18 @@ class FHRPGroupProtocolChoices(ChoiceSet): CHOICES = ( (_('Standard'), ( - (PROTOCOL_VRRP2, _('VRRPv2')), - (PROTOCOL_VRRP3, _('VRRPv3')), - (PROTOCOL_CARP, _('CARP')), + (PROTOCOL_VRRP2, 'VRRPv2'), + (PROTOCOL_VRRP3, 'VRRPv3'), + (PROTOCOL_CARP, 'CARP'), )), (_('CheckPoint'), ( - (PROTOCOL_CLUSTERXL, _('ClusterXL')), + (PROTOCOL_CLUSTERXL, 'ClusterXL'), )), (_('Cisco'), ( - (PROTOCOL_HSRP, _('HSRP')), - (PROTOCOL_GLBP, _('GLBP')), + (PROTOCOL_HSRP, 'HSRP'), + (PROTOCOL_GLBP, 'GLBP'), )), - (PROTOCOL_OTHER, _('Other')), + (PROTOCOL_OTHER, 'Other'), ) @@ -134,7 +135,7 @@ class FHRPGroupAuthTypeChoices(ChoiceSet): CHOICES = ( (AUTHENTICATION_PLAINTEXT, _('Plaintext')), - (AUTHENTICATION_MD5, _('MD5')), + (AUTHENTICATION_MD5, 'MD5'), ) @@ -167,9 +168,9 @@ class ServiceProtocolChoices(ChoiceSet): PROTOCOL_SCTP = 'sctp' CHOICES = ( - (PROTOCOL_TCP, _('TCP')), - (PROTOCOL_UDP, _('UDP')), - (PROTOCOL_SCTP, _('SCTP')), + (PROTOCOL_TCP, 'TCP'), + (PROTOCOL_UDP, 'UDP'), + (PROTOCOL_SCTP, 'SCTP'), ) @@ -188,29 +189,29 @@ class L2VPNTypeChoices(ChoiceSet): TYPE_PBB_EVPN = 'pbb-evpn' CHOICES = ( - (_('VPLS'), ( - (TYPE_VPWS, _('VPWS')), - (TYPE_VPLS, _('VPLS')), + ('VPLS', ( + (TYPE_VPWS, 'VPWS'), + (TYPE_VPLS, 'VPLS'), )), - (_('VXLAN'), ( - (TYPE_VXLAN, _('VXLAN')), - (TYPE_VXLAN_EVPN, _('VXLAN-EVPN')), + ('VXLAN', ( + (TYPE_VXLAN, 'VXLAN'), + (TYPE_VXLAN_EVPN, 'VXLAN-EVPN'), )), - (_('L2VPN E-VPN'), ( - (TYPE_MPLS_EVPN, _('MPLS EVPN')), - (TYPE_PBB_EVPN, _('PBB EVPN')), + ('L2VPN E-VPN', ( + (TYPE_MPLS_EVPN, 'MPLS EVPN'), + (TYPE_PBB_EVPN, 'PBB EVPN'), )), - (_('E-Line'), ( - (TYPE_EPL, _('EPL')), - (TYPE_EVPL, _('EVPL')), + ('E-Line', ( + (TYPE_EPL, 'EPL'), + (TYPE_EVPL, 'EVPL'), )), - (_('E-LAN'), ( - (TYPE_EPLAN, _('Ethernet Private LAN')), - (TYPE_EVPLAN, _('Ethernet Virtual Private LAN')), + ('E-LAN', ( + (TYPE_EPLAN, 'Ethernet Private LAN'), + (TYPE_EVPLAN, 'Ethernet Virtual Private LAN'), )), - (_('E-Tree'), ( - (TYPE_EPTREE, _('Ethernet Private Tree')), - (TYPE_EVPTREE, _('Ethernet Virtual Private Tree')), + ('E-Tree', ( + (TYPE_EPTREE, 'Ethernet Private Tree'), + (TYPE_EVPTREE, 'Ethernet Virtual Private Tree'), )), ) diff --git a/netbox/tenancy/choices.py b/netbox/tenancy/choices.py index ce30aecd2..177a6f2b5 100644 --- a/netbox/tenancy/choices.py +++ b/netbox/tenancy/choices.py @@ -1,4 +1,5 @@ from django.utils.translation import gettext_lazy as _ + from utilities.choices import ChoiceSet diff --git a/netbox/utilities/choices.py b/netbox/utilities/choices.py index ccc37d26d..b6f97e309 100644 --- a/netbox/utilities/choices.py +++ b/netbox/utilities/choices.py @@ -10,7 +10,9 @@ class ChoiceSetMeta(type): # Extend static choices with any configured choices if key := attrs.get('key'): - assert type(attrs['CHOICES']) is list, _("{name} has a key defined but CHOICES is not a list").format(name=name) + assert type(attrs['CHOICES']) is list, _( + "{name} has a key defined but CHOICES is not a list" + ).format(name=name) app = attrs['__module__'].split('.', 1)[0] replace_key = f'{app}.{key}' extend_key = f'{replace_key}+' if replace_key else None @@ -224,7 +226,7 @@ class ImportFormatChoices(ChoiceSet): CHOICES = [ (AUTO, _('Auto-detect')), - (CSV, _('CSV')), - (JSON, _('JSON')), - (YAML, _('YAML')), + (CSV, 'CSV'), + (JSON, 'JSON'), + (YAML, 'YAML'), ] diff --git a/netbox/virtualization/choices.py b/netbox/virtualization/choices.py index 2b7ce98b9..f8ec42171 100644 --- a/netbox/virtualization/choices.py +++ b/netbox/virtualization/choices.py @@ -1,4 +1,5 @@ from django.utils.translation import gettext_lazy as _ + from utilities.choices import ChoiceSet diff --git a/netbox/wireless/choices.py b/netbox/wireless/choices.py index f35fe60c3..710cd3a8d 100644 --- a/netbox/wireless/choices.py +++ b/netbox/wireless/choices.py @@ -238,220 +238,220 @@ class WirelessChannelChoices(ChoiceSet): CHOICES = ( ( - _('2.4 GHz (802.11b/g/n/ax)'), + '2.4 GHz (802.11b/g/n/ax)', ( - (CHANNEL_24G_1, _('1 (2412 MHz)')), - (CHANNEL_24G_2, _('2 (2417 MHz)')), - (CHANNEL_24G_3, _('3 (2422 MHz)')), - (CHANNEL_24G_4, _('4 (2427 MHz)')), - (CHANNEL_24G_5, _('5 (2432 MHz)')), - (CHANNEL_24G_6, _('6 (2437 MHz)')), - (CHANNEL_24G_7, _('7 (2442 MHz)')), - (CHANNEL_24G_8, _('8 (2447 MHz)')), - (CHANNEL_24G_9, _('9 (2452 MHz)')), - (CHANNEL_24G_10, _('10 (2457 MHz)')), - (CHANNEL_24G_11, _('11 (2462 MHz)')), - (CHANNEL_24G_12, _('12 (2467 MHz)')), - (CHANNEL_24G_13, _('13 (2472 MHz)')), + (CHANNEL_24G_1, '1 (2412 MHz)'), + (CHANNEL_24G_2, '2 (2417 MHz)'), + (CHANNEL_24G_3, '3 (2422 MHz)'), + (CHANNEL_24G_4, '4 (2427 MHz)'), + (CHANNEL_24G_5, '5 (2432 MHz)'), + (CHANNEL_24G_6, '6 (2437 MHz)'), + (CHANNEL_24G_7, '7 (2442 MHz)'), + (CHANNEL_24G_8, '8 (2447 MHz)'), + (CHANNEL_24G_9, '9 (2452 MHz)'), + (CHANNEL_24G_10, '10 (2457 MHz)'), + (CHANNEL_24G_11, '11 (2462 MHz)'), + (CHANNEL_24G_12, '12 (2467 MHz)'), + (CHANNEL_24G_13, '13 (2472 MHz)'), ) ), ( - _('5 GHz (802.11a/n/ac/ax)'), + '5 GHz (802.11a/n/ac/ax)', ( - (CHANNEL_5G_32, _('32 (5160/20 MHz)')), - (CHANNEL_5G_34, _('34 (5170/40 MHz)')), - (CHANNEL_5G_36, _('36 (5180/20 MHz)')), - (CHANNEL_5G_38, _('38 (5190/40 MHz)')), - (CHANNEL_5G_40, _('40 (5200/20 MHz)')), - (CHANNEL_5G_42, _('42 (5210/80 MHz)')), - (CHANNEL_5G_44, _('44 (5220/20 MHz)')), - (CHANNEL_5G_46, _('46 (5230/40 MHz)')), - (CHANNEL_5G_48, _('48 (5240/20 MHz)')), - (CHANNEL_5G_50, _('50 (5250/160 MHz)')), - (CHANNEL_5G_52, _('52 (5260/20 MHz)')), - (CHANNEL_5G_54, _('54 (5270/40 MHz)')), - (CHANNEL_5G_56, _('56 (5280/20 MHz)')), - (CHANNEL_5G_58, _('58 (5290/80 MHz)')), - (CHANNEL_5G_60, _('60 (5300/20 MHz)')), - (CHANNEL_5G_62, _('62 (5310/40 MHz)')), - (CHANNEL_5G_64, _('64 (5320/20 MHz)')), - (CHANNEL_5G_100, _('100 (5500/20 MHz)')), - (CHANNEL_5G_102, _('102 (5510/40 MHz)')), - (CHANNEL_5G_104, _('104 (5520/20 MHz)')), - (CHANNEL_5G_106, _('106 (5530/80 MHz)')), - (CHANNEL_5G_108, _('108 (5540/20 MHz)')), - (CHANNEL_5G_110, _('110 (5550/40 MHz)')), - (CHANNEL_5G_112, _('112 (5560/20 MHz)')), - (CHANNEL_5G_114, _('114 (5570/160 MHz)')), - (CHANNEL_5G_116, _('116 (5580/20 MHz)')), - (CHANNEL_5G_118, _('118 (5590/40 MHz)')), - (CHANNEL_5G_120, _('120 (5600/20 MHz)')), - (CHANNEL_5G_122, _('122 (5610/80 MHz)')), - (CHANNEL_5G_124, _('124 (5620/20 MHz)')), - (CHANNEL_5G_126, _('126 (5630/40 MHz)')), - (CHANNEL_5G_128, _('128 (5640/20 MHz)')), - (CHANNEL_5G_132, _('132 (5660/20 MHz)')), - (CHANNEL_5G_134, _('134 (5670/40 MHz)')), - (CHANNEL_5G_136, _('136 (5680/20 MHz)')), - (CHANNEL_5G_138, _('138 (5690/80 MHz)')), - (CHANNEL_5G_140, _('140 (5700/20 MHz)')), - (CHANNEL_5G_142, _('142 (5710/40 MHz)')), - (CHANNEL_5G_144, _('144 (5720/20 MHz)')), - (CHANNEL_5G_149, _('149 (5745/20 MHz)')), - (CHANNEL_5G_151, _('151 (5755/40 MHz)')), - (CHANNEL_5G_153, _('153 (5765/20 MHz)')), - (CHANNEL_5G_155, _('155 (5775/80 MHz)')), - (CHANNEL_5G_157, _('157 (5785/20 MHz)')), - (CHANNEL_5G_159, _('159 (5795/40 MHz)')), - (CHANNEL_5G_161, _('161 (5805/20 MHz)')), - (CHANNEL_5G_163, _('163 (5815/160 MHz)')), - (CHANNEL_5G_165, _('165 (5825/20 MHz)')), - (CHANNEL_5G_167, _('167 (5835/40 MHz)')), - (CHANNEL_5G_169, _('169 (5845/20 MHz)')), - (CHANNEL_5G_171, _('171 (5855/80 MHz)')), - (CHANNEL_5G_173, _('173 (5865/20 MHz)')), - (CHANNEL_5G_175, _('175 (5875/40 MHz)')), - (CHANNEL_5G_177, _('177 (5885/20 MHz)')), + (CHANNEL_5G_32, '32 (5160/20 MHz)'), + (CHANNEL_5G_34, '34 (5170/40 MHz)'), + (CHANNEL_5G_36, '36 (5180/20 MHz)'), + (CHANNEL_5G_38, '38 (5190/40 MHz)'), + (CHANNEL_5G_40, '40 (5200/20 MHz)'), + (CHANNEL_5G_42, '42 (5210/80 MHz)'), + (CHANNEL_5G_44, '44 (5220/20 MHz)'), + (CHANNEL_5G_46, '46 (5230/40 MHz)'), + (CHANNEL_5G_48, '48 (5240/20 MHz)'), + (CHANNEL_5G_50, '50 (5250/160 MHz)'), + (CHANNEL_5G_52, '52 (5260/20 MHz)'), + (CHANNEL_5G_54, '54 (5270/40 MHz)'), + (CHANNEL_5G_56, '56 (5280/20 MHz)'), + (CHANNEL_5G_58, '58 (5290/80 MHz)'), + (CHANNEL_5G_60, '60 (5300/20 MHz)'), + (CHANNEL_5G_62, '62 (5310/40 MHz)'), + (CHANNEL_5G_64, '64 (5320/20 MHz)'), + (CHANNEL_5G_100, '100 (5500/20 MHz)'), + (CHANNEL_5G_102, '102 (5510/40 MHz)'), + (CHANNEL_5G_104, '104 (5520/20 MHz)'), + (CHANNEL_5G_106, '106 (5530/80 MHz)'), + (CHANNEL_5G_108, '108 (5540/20 MHz)'), + (CHANNEL_5G_110, '110 (5550/40 MHz)'), + (CHANNEL_5G_112, '112 (5560/20 MHz)'), + (CHANNEL_5G_114, '114 (5570/160 MHz)'), + (CHANNEL_5G_116, '116 (5580/20 MHz)'), + (CHANNEL_5G_118, '118 (5590/40 MHz)'), + (CHANNEL_5G_120, '120 (5600/20 MHz)'), + (CHANNEL_5G_122, '122 (5610/80 MHz)'), + (CHANNEL_5G_124, '124 (5620/20 MHz)'), + (CHANNEL_5G_126, '126 (5630/40 MHz)'), + (CHANNEL_5G_128, '128 (5640/20 MHz)'), + (CHANNEL_5G_132, '132 (5660/20 MHz)'), + (CHANNEL_5G_134, '134 (5670/40 MHz)'), + (CHANNEL_5G_136, '136 (5680/20 MHz)'), + (CHANNEL_5G_138, '138 (5690/80 MHz)'), + (CHANNEL_5G_140, '140 (5700/20 MHz)'), + (CHANNEL_5G_142, '142 (5710/40 MHz)'), + (CHANNEL_5G_144, '144 (5720/20 MHz)'), + (CHANNEL_5G_149, '149 (5745/20 MHz)'), + (CHANNEL_5G_151, '151 (5755/40 MHz)'), + (CHANNEL_5G_153, '153 (5765/20 MHz)'), + (CHANNEL_5G_155, '155 (5775/80 MHz)'), + (CHANNEL_5G_157, '157 (5785/20 MHz)'), + (CHANNEL_5G_159, '159 (5795/40 MHz)'), + (CHANNEL_5G_161, '161 (5805/20 MHz)'), + (CHANNEL_5G_163, '163 (5815/160 MHz)'), + (CHANNEL_5G_165, '165 (5825/20 MHz)'), + (CHANNEL_5G_167, '167 (5835/40 MHz)'), + (CHANNEL_5G_169, '169 (5845/20 MHz)'), + (CHANNEL_5G_171, '171 (5855/80 MHz)'), + (CHANNEL_5G_173, '173 (5865/20 MHz)'), + (CHANNEL_5G_175, '175 (5875/40 MHz)'), + (CHANNEL_5G_177, '177 (5885/20 MHz)'), ) ), ( - _('6 GHz (802.11ax)'), + '6 GHz (802.11ax)', ( - (CHANNEL_6G_1, _('1 (5955/20 MHz)')), - (CHANNEL_6G_3, _('3 (5965/40 MHz)')), - (CHANNEL_6G_5, _('5 (5975/20 MHz)')), - (CHANNEL_6G_7, _('7 (5985/80 MHz)')), - (CHANNEL_6G_9, _('9 (5995/20 MHz)')), - (CHANNEL_6G_11, _('11 (6005/40 MHz)')), - (CHANNEL_6G_13, _('13 (6015/20 MHz)')), - (CHANNEL_6G_15, _('15 (6025/160 MHz)')), - (CHANNEL_6G_17, _('17 (6035/20 MHz)')), - (CHANNEL_6G_19, _('19 (6045/40 MHz)')), - (CHANNEL_6G_21, _('21 (6055/20 MHz)')), - (CHANNEL_6G_23, _('23 (6065/80 MHz)')), - (CHANNEL_6G_25, _('25 (6075/20 MHz)')), - (CHANNEL_6G_27, _('27 (6085/40 MHz)')), - (CHANNEL_6G_29, _('29 (6095/20 MHz)')), - (CHANNEL_6G_31, _('31 (6105/320 MHz)')), - (CHANNEL_6G_33, _('33 (6115/20 MHz)')), - (CHANNEL_6G_35, _('35 (6125/40 MHz)')), - (CHANNEL_6G_37, _('37 (6135/20 MHz)')), - (CHANNEL_6G_39, _('39 (6145/80 MHz)')), - (CHANNEL_6G_41, _('41 (6155/20 MHz)')), - (CHANNEL_6G_43, _('43 (6165/40 MHz)')), - (CHANNEL_6G_45, _('45 (6175/20 MHz)')), - (CHANNEL_6G_47, _('47 (6185/160 MHz)')), - (CHANNEL_6G_49, _('49 (6195/20 MHz)')), - (CHANNEL_6G_51, _('51 (6205/40 MHz)')), - (CHANNEL_6G_53, _('53 (6215/20 MHz)')), - (CHANNEL_6G_55, _('55 (6225/80 MHz)')), - (CHANNEL_6G_57, _('57 (6235/20 MHz)')), - (CHANNEL_6G_59, _('59 (6245/40 MHz)')), - (CHANNEL_6G_61, _('61 (6255/20 MHz)')), - (CHANNEL_6G_65, _('65 (6275/20 MHz)')), - (CHANNEL_6G_67, _('67 (6285/40 MHz)')), - (CHANNEL_6G_69, _('69 (6295/20 MHz)')), - (CHANNEL_6G_71, _('71 (6305/80 MHz)')), - (CHANNEL_6G_73, _('73 (6315/20 MHz)')), - (CHANNEL_6G_75, _('75 (6325/40 MHz)')), - (CHANNEL_6G_77, _('77 (6335/20 MHz)')), - (CHANNEL_6G_79, _('79 (6345/160 MHz)')), - (CHANNEL_6G_81, _('81 (6355/20 MHz)')), - (CHANNEL_6G_83, _('83 (6365/40 MHz)')), - (CHANNEL_6G_85, _('85 (6375/20 MHz)')), - (CHANNEL_6G_87, _('87 (6385/80 MHz)')), - (CHANNEL_6G_89, _('89 (6395/20 MHz)')), - (CHANNEL_6G_91, _('91 (6405/40 MHz)')), - (CHANNEL_6G_93, _('93 (6415/20 MHz)')), - (CHANNEL_6G_95, _('95 (6425/320 MHz)')), - (CHANNEL_6G_97, _('97 (6435/20 MHz)')), - (CHANNEL_6G_99, _('99 (6445/40 MHz)')), - (CHANNEL_6G_101, _('101 (6455/20 MHz)')), - (CHANNEL_6G_103, _('103 (6465/80 MHz)')), - (CHANNEL_6G_105, _('105 (6475/20 MHz)')), - (CHANNEL_6G_107, _('107 (6485/40 MHz)')), - (CHANNEL_6G_109, _('109 (6495/20 MHz)')), - (CHANNEL_6G_111, _('111 (6505/160 MHz)')), - (CHANNEL_6G_113, _('113 (6515/20 MHz)')), - (CHANNEL_6G_115, _('115 (6525/40 MHz)')), - (CHANNEL_6G_117, _('117 (6535/20 MHz)')), - (CHANNEL_6G_119, _('119 (6545/80 MHz)')), - (CHANNEL_6G_121, _('121 (6555/20 MHz)')), - (CHANNEL_6G_123, _('123 (6565/40 MHz)')), - (CHANNEL_6G_125, _('125 (6575/20 MHz)')), - (CHANNEL_6G_129, _('129 (6595/20 MHz)')), - (CHANNEL_6G_131, _('131 (6605/40 MHz)')), - (CHANNEL_6G_133, _('133 (6615/20 MHz)')), - (CHANNEL_6G_135, _('135 (6625/80 MHz)')), - (CHANNEL_6G_137, _('137 (6635/20 MHz)')), - (CHANNEL_6G_139, _('139 (6645/40 MHz)')), - (CHANNEL_6G_141, _('141 (6655/20 MHz)')), - (CHANNEL_6G_143, _('143 (6665/160 MHz)')), - (CHANNEL_6G_145, _('145 (6675/20 MHz)')), - (CHANNEL_6G_147, _('147 (6685/40 MHz)')), - (CHANNEL_6G_149, _('149 (6695/20 MHz)')), - (CHANNEL_6G_151, _('151 (6705/80 MHz)')), - (CHANNEL_6G_153, _('153 (6715/20 MHz)')), - (CHANNEL_6G_155, _('155 (6725/40 MHz)')), - (CHANNEL_6G_157, _('157 (6735/20 MHz)')), - (CHANNEL_6G_159, _('159 (6745/320 MHz)')), - (CHANNEL_6G_161, _('161 (6755/20 MHz)')), - (CHANNEL_6G_163, _('163 (6765/40 MHz)')), - (CHANNEL_6G_165, _('165 (6775/20 MHz)')), - (CHANNEL_6G_167, _('167 (6785/80 MHz)')), - (CHANNEL_6G_169, _('169 (6795/20 MHz)')), - (CHANNEL_6G_171, _('171 (6805/40 MHz)')), - (CHANNEL_6G_173, _('173 (6815/20 MHz)')), - (CHANNEL_6G_175, _('175 (6825/160 MHz)')), - (CHANNEL_6G_177, _('177 (6835/20 MHz)')), - (CHANNEL_6G_179, _('179 (6845/40 MHz)')), - (CHANNEL_6G_181, _('181 (6855/20 MHz)')), - (CHANNEL_6G_183, _('183 (6865/80 MHz)')), - (CHANNEL_6G_185, _('185 (6875/20 MHz)')), - (CHANNEL_6G_187, _('187 (6885/40 MHz)')), - (CHANNEL_6G_189, _('189 (6895/20 MHz)')), - (CHANNEL_6G_193, _('193 (6915/20 MHz)')), - (CHANNEL_6G_195, _('195 (6925/40 MHz)')), - (CHANNEL_6G_197, _('197 (6935/20 MHz)')), - (CHANNEL_6G_199, _('199 (6945/80 MHz)')), - (CHANNEL_6G_201, _('201 (6955/20 MHz)')), - (CHANNEL_6G_203, _('203 (6965/40 MHz)')), - (CHANNEL_6G_205, _('205 (6975/20 MHz)')), - (CHANNEL_6G_207, _('207 (6985/160 MHz)')), - (CHANNEL_6G_209, _('209 (6995/20 MHz)')), - (CHANNEL_6G_211, _('211 (7005/40 MHz)')), - (CHANNEL_6G_213, _('213 (7015/20 MHz)')), - (CHANNEL_6G_215, _('215 (7025/80 MHz)')), - (CHANNEL_6G_217, _('217 (7035/20 MHz)')), - (CHANNEL_6G_219, _('219 (7045/40 MHz)')), - (CHANNEL_6G_221, _('221 (7055/20 MHz)')), - (CHANNEL_6G_225, _('225 (7075/20 MHz)')), - (CHANNEL_6G_227, _('227 (7085/40 MHz)')), - (CHANNEL_6G_229, _('229 (7095/20 MHz)')), - (CHANNEL_6G_233, _('233 (7115/20 MHz)')), + (CHANNEL_6G_1, '1 (5955/20 MHz)'), + (CHANNEL_6G_3, '3 (5965/40 MHz)'), + (CHANNEL_6G_5, '5 (5975/20 MHz)'), + (CHANNEL_6G_7, '7 (5985/80 MHz)'), + (CHANNEL_6G_9, '9 (5995/20 MHz)'), + (CHANNEL_6G_11, '11 (6005/40 MHz)'), + (CHANNEL_6G_13, '13 (6015/20 MHz)'), + (CHANNEL_6G_15, '15 (6025/160 MHz)'), + (CHANNEL_6G_17, '17 (6035/20 MHz)'), + (CHANNEL_6G_19, '19 (6045/40 MHz)'), + (CHANNEL_6G_21, '21 (6055/20 MHz)'), + (CHANNEL_6G_23, '23 (6065/80 MHz)'), + (CHANNEL_6G_25, '25 (6075/20 MHz)'), + (CHANNEL_6G_27, '27 (6085/40 MHz)'), + (CHANNEL_6G_29, '29 (6095/20 MHz)'), + (CHANNEL_6G_31, '31 (6105/320 MHz)'), + (CHANNEL_6G_33, '33 (6115/20 MHz)'), + (CHANNEL_6G_35, '35 (6125/40 MHz)'), + (CHANNEL_6G_37, '37 (6135/20 MHz)'), + (CHANNEL_6G_39, '39 (6145/80 MHz)'), + (CHANNEL_6G_41, '41 (6155/20 MHz)'), + (CHANNEL_6G_43, '43 (6165/40 MHz)'), + (CHANNEL_6G_45, '45 (6175/20 MHz)'), + (CHANNEL_6G_47, '47 (6185/160 MHz)'), + (CHANNEL_6G_49, '49 (6195/20 MHz)'), + (CHANNEL_6G_51, '51 (6205/40 MHz)'), + (CHANNEL_6G_53, '53 (6215/20 MHz)'), + (CHANNEL_6G_55, '55 (6225/80 MHz)'), + (CHANNEL_6G_57, '57 (6235/20 MHz)'), + (CHANNEL_6G_59, '59 (6245/40 MHz)'), + (CHANNEL_6G_61, '61 (6255/20 MHz)'), + (CHANNEL_6G_65, '65 (6275/20 MHz)'), + (CHANNEL_6G_67, '67 (6285/40 MHz)'), + (CHANNEL_6G_69, '69 (6295/20 MHz)'), + (CHANNEL_6G_71, '71 (6305/80 MHz)'), + (CHANNEL_6G_73, '73 (6315/20 MHz)'), + (CHANNEL_6G_75, '75 (6325/40 MHz)'), + (CHANNEL_6G_77, '77 (6335/20 MHz)'), + (CHANNEL_6G_79, '79 (6345/160 MHz)'), + (CHANNEL_6G_81, '81 (6355/20 MHz)'), + (CHANNEL_6G_83, '83 (6365/40 MHz)'), + (CHANNEL_6G_85, '85 (6375/20 MHz)'), + (CHANNEL_6G_87, '87 (6385/80 MHz)'), + (CHANNEL_6G_89, '89 (6395/20 MHz)'), + (CHANNEL_6G_91, '91 (6405/40 MHz)'), + (CHANNEL_6G_93, '93 (6415/20 MHz)'), + (CHANNEL_6G_95, '95 (6425/320 MHz)'), + (CHANNEL_6G_97, '97 (6435/20 MHz)'), + (CHANNEL_6G_99, '99 (6445/40 MHz)'), + (CHANNEL_6G_101, '101 (6455/20 MHz)'), + (CHANNEL_6G_103, '103 (6465/80 MHz)'), + (CHANNEL_6G_105, '105 (6475/20 MHz)'), + (CHANNEL_6G_107, '107 (6485/40 MHz)'), + (CHANNEL_6G_109, '109 (6495/20 MHz)'), + (CHANNEL_6G_111, '111 (6505/160 MHz)'), + (CHANNEL_6G_113, '113 (6515/20 MHz)'), + (CHANNEL_6G_115, '115 (6525/40 MHz)'), + (CHANNEL_6G_117, '117 (6535/20 MHz)'), + (CHANNEL_6G_119, '119 (6545/80 MHz)'), + (CHANNEL_6G_121, '121 (6555/20 MHz)'), + (CHANNEL_6G_123, '123 (6565/40 MHz)'), + (CHANNEL_6G_125, '125 (6575/20 MHz)'), + (CHANNEL_6G_129, '129 (6595/20 MHz)'), + (CHANNEL_6G_131, '131 (6605/40 MHz)'), + (CHANNEL_6G_133, '133 (6615/20 MHz)'), + (CHANNEL_6G_135, '135 (6625/80 MHz)'), + (CHANNEL_6G_137, '137 (6635/20 MHz)'), + (CHANNEL_6G_139, '139 (6645/40 MHz)'), + (CHANNEL_6G_141, '141 (6655/20 MHz)'), + (CHANNEL_6G_143, '143 (6665/160 MHz)'), + (CHANNEL_6G_145, '145 (6675/20 MHz)'), + (CHANNEL_6G_147, '147 (6685/40 MHz)'), + (CHANNEL_6G_149, '149 (6695/20 MHz)'), + (CHANNEL_6G_151, '151 (6705/80 MHz)'), + (CHANNEL_6G_153, '153 (6715/20 MHz)'), + (CHANNEL_6G_155, '155 (6725/40 MHz)'), + (CHANNEL_6G_157, '157 (6735/20 MHz)'), + (CHANNEL_6G_159, '159 (6745/320 MHz)'), + (CHANNEL_6G_161, '161 (6755/20 MHz)'), + (CHANNEL_6G_163, '163 (6765/40 MHz)'), + (CHANNEL_6G_165, '165 (6775/20 MHz)'), + (CHANNEL_6G_167, '167 (6785/80 MHz)'), + (CHANNEL_6G_169, '169 (6795/20 MHz)'), + (CHANNEL_6G_171, '171 (6805/40 MHz)'), + (CHANNEL_6G_173, '173 (6815/20 MHz)'), + (CHANNEL_6G_175, '175 (6825/160 MHz)'), + (CHANNEL_6G_177, '177 (6835/20 MHz)'), + (CHANNEL_6G_179, '179 (6845/40 MHz)'), + (CHANNEL_6G_181, '181 (6855/20 MHz)'), + (CHANNEL_6G_183, '183 (6865/80 MHz)'), + (CHANNEL_6G_185, '185 (6875/20 MHz)'), + (CHANNEL_6G_187, '187 (6885/40 MHz)'), + (CHANNEL_6G_189, '189 (6895/20 MHz)'), + (CHANNEL_6G_193, '193 (6915/20 MHz)'), + (CHANNEL_6G_195, '195 (6925/40 MHz)'), + (CHANNEL_6G_197, '197 (6935/20 MHz)'), + (CHANNEL_6G_199, '199 (6945/80 MHz)'), + (CHANNEL_6G_201, '201 (6955/20 MHz)'), + (CHANNEL_6G_203, '203 (6965/40 MHz)'), + (CHANNEL_6G_205, '205 (6975/20 MHz)'), + (CHANNEL_6G_207, '207 (6985/160 MHz)'), + (CHANNEL_6G_209, '209 (6995/20 MHz)'), + (CHANNEL_6G_211, '211 (7005/40 MHz)'), + (CHANNEL_6G_213, '213 (7015/20 MHz)'), + (CHANNEL_6G_215, '215 (7025/80 MHz)'), + (CHANNEL_6G_217, '217 (7035/20 MHz)'), + (CHANNEL_6G_219, '219 (7045/40 MHz)'), + (CHANNEL_6G_221, '221 (7055/20 MHz)'), + (CHANNEL_6G_225, '225 (7075/20 MHz)'), + (CHANNEL_6G_227, '227 (7085/40 MHz)'), + (CHANNEL_6G_229, '229 (7095/20 MHz)'), + (CHANNEL_6G_233, '233 (7115/20 MHz)'), ) ), ( - _('60 GHz (802.11ad/ay)'), + '60 GHz (802.11ad/ay)', ( - (CHANNEL_60G_1, _('1 (58.32/2.16 GHz)')), - (CHANNEL_60G_2, _('2 (60.48/2.16 GHz)')), - (CHANNEL_60G_3, _('3 (62.64/2.16 GHz)')), - (CHANNEL_60G_4, _('4 (64.80/2.16 GHz)')), - (CHANNEL_60G_5, _('5 (66.96/2.16 GHz)')), - (CHANNEL_60G_6, _('6 (69.12/2.16 GHz)')), - (CHANNEL_60G_9, _('9 (59.40/4.32 GHz)')), - (CHANNEL_60G_10, _('10 (61.56/4.32 GHz)')), - (CHANNEL_60G_11, _('11 (63.72/4.32 GHz)')), - (CHANNEL_60G_12, _('12 (65.88/4.32 GHz)')), - (CHANNEL_60G_13, _('13 (68.04/4.32 GHz)')), - (CHANNEL_60G_17, _('17 (60.48/6.48 GHz)')), - (CHANNEL_60G_18, _('18 (62.64/6.48 GHz)')), - (CHANNEL_60G_19, _('19 (64.80/6.48 GHz)')), - (CHANNEL_60G_20, _('20 (66.96/6.48 GHz)')), - (CHANNEL_60G_25, _('25 (61.56/8.64 GHz)')), - (CHANNEL_60G_26, _('26 (63.72/8.64 GHz)')), - (CHANNEL_60G_27, _('27 (65.88/8.64 GHz)')), + (CHANNEL_60G_1, '1 (58.32/2.16 GHz)'), + (CHANNEL_60G_2, '2 (60.48/2.16 GHz)'), + (CHANNEL_60G_3, '3 (62.64/2.16 GHz)'), + (CHANNEL_60G_4, '4 (64.80/2.16 GHz)'), + (CHANNEL_60G_5, '5 (66.96/2.16 GHz)'), + (CHANNEL_60G_6, '6 (69.12/2.16 GHz)'), + (CHANNEL_60G_9, '9 (59.40/4.32 GHz)'), + (CHANNEL_60G_10, '10 (61.56/4.32 GHz)'), + (CHANNEL_60G_11, '11 (63.72/4.32 GHz)'), + (CHANNEL_60G_12, '12 (65.88/4.32 GHz)'), + (CHANNEL_60G_13, '13 (68.04/4.32 GHz)'), + (CHANNEL_60G_17, '17 (60.48/6.48 GHz)'), + (CHANNEL_60G_18, '18 (62.64/6.48 GHz)'), + (CHANNEL_60G_19, '19 (64.80/6.48 GHz)'), + (CHANNEL_60G_20, '20 (66.96/6.48 GHz)'), + (CHANNEL_60G_25, '25 (61.56/8.64 GHz)'), + (CHANNEL_60G_26, '26 (63.72/8.64 GHz)'), + (CHANNEL_60G_27, '27 (65.88/8.64 GHz)'), ) ), ) @@ -465,7 +465,7 @@ class WirelessAuthTypeChoices(ChoiceSet): CHOICES = ( (TYPE_OPEN, _('Open')), - (TYPE_WEP, _('WEP')), + (TYPE_WEP, 'WEP'), (TYPE_WPA_PERSONAL, _('WPA Personal (PSK)')), (TYPE_WPA_ENTERPRISE, _('WPA Enterprise')), ) @@ -478,6 +478,6 @@ class WirelessAuthCipherChoices(ChoiceSet): CHOICES = ( (CIPHER_AUTO, _('Auto')), - (CIPHER_TKIP, _('TKIP')), - (CIPHER_AES, _('AES')), + (CIPHER_TKIP, 'TKIP'), + (CIPHER_AES, 'AES'), )