From cce89a55fbde4e13e1ad88d024aafb57b3f6d1fa Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@netboxlabs.com>
Date: Tue, 5 Sep 2023 13:38:55 -0400
Subject: [PATCH] Misc cleanup

---
 netbox/extras/tests/test_customfields.py | 6 +++++-
 netbox/utilities/choices.py              | 8 ++++----
 netbox/utilities/forms/bulk_import.py    | 4 ++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/netbox/extras/tests/test_customfields.py b/netbox/extras/tests/test_customfields.py
index f0032c434..38975d54e 100644
--- a/netbox/extras/tests/test_customfields.py
+++ b/netbox/extras/tests/test_customfields.py
@@ -1086,7 +1086,11 @@ class CustomFieldImportTest(TestCase):
         )
         csv_data = '\n'.join(','.join(row) for row in data)
 
-        response = self.client.post(reverse('dcim:site_import'), {'data': csv_data, 'format': ImportFormatChoices.CSV, 'csv_delimiter': CSVDelimiterChoices.AUTO})
+        response = self.client.post(reverse('dcim:site_import'), {
+            'data': csv_data,
+            'format': ImportFormatChoices.CSV,
+            'csv_delimiter': CSVDelimiterChoices.AUTO,
+        })
         self.assertEqual(response.status_code, 302)
         self.assertEqual(Site.objects.count(), 3)
 
diff --git a/netbox/utilities/choices.py b/netbox/utilities/choices.py
index 7bc1ef674..193da6b5a 100644
--- a/netbox/utilities/choices.py
+++ b/netbox/utilities/choices.py
@@ -239,8 +239,8 @@ class CSVDelimiterChoices(ChoiceSet):
     TAB = '\t'
 
     CHOICES = [
-        (AUTO, 'Auto-detect'),
-        (COMMA, 'Comma'),
-        (SEMICOLON, 'Semicolon'),
-        (TAB, 'Tab'),
+        (AUTO, _('Auto-detect')),
+        (COMMA, _('Comma')),
+        (SEMICOLON, _('Semicolon')),
+        (TAB, _('Tab')),
     ]
diff --git a/netbox/utilities/forms/bulk_import.py b/netbox/utilities/forms/bulk_import.py
index 05078ebfb..99952a1be 100644
--- a/netbox/utilities/forms/bulk_import.py
+++ b/netbox/utilities/forms/bulk_import.py
@@ -24,7 +24,7 @@ class BulkImportForm(BootstrapMixin, SyncedDataMixin, forms.Form):
         help_text=_("Enter object data in CSV, JSON or YAML format.")
     )
     upload_file = forms.FileField(
-        label="Data file",
+        label=_("Data file"),
         required=False
     )
     format = forms.ChoiceField(
@@ -34,7 +34,7 @@ class BulkImportForm(BootstrapMixin, SyncedDataMixin, forms.Form):
     csv_delimiter = forms.ChoiceField(
         choices=CSVDelimiterChoices,
         initial=CSVDelimiterChoices.AUTO,
-        label="CSV Delimiter",
+        label=_("CSV delimiter"),
         help_text=_("The character which delimits CSV fields. Applies only to CSV format."),
         required=False
     )