From 885b802ae41269e5b008b57e4077aa27631e3ead Mon Sep 17 00:00:00 2001
From: Jason Novinger <jnovinger@gmail.com>
Date: Fri, 18 Jul 2025 09:38:15 -0500
Subject: [PATCH] Change ~service to ~'application service' hardcoded strings
 in Python files

---
 netbox/ipam/filtersets.py        |  2 +-
 netbox/ipam/forms/model_forms.py | 12 +++++++-----
 netbox/ipam/models/services.py   |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/netbox/ipam/filtersets.py b/netbox/ipam/filtersets.py
index 5e6ffb2ac..7f8cd2f04 100644
--- a/netbox/ipam/filtersets.py
+++ b/netbox/ipam/filtersets.py
@@ -660,7 +660,7 @@ class IPAddressFilterSet(NetBoxModelFilterSet, TenancyFilterSet, ContactModelFil
     service_id = django_filters.ModelMultipleChoiceFilter(
         field_name='services',
         queryset=Service.objects.all(),
-        label=_('Service (ID)'),
+        label=_('Application Service (ID)'),
     )
     nat_inside_id = django_filters.ModelMultipleChoiceFilter(
         field_name='nat_inside',
diff --git a/netbox/ipam/forms/model_forms.py b/netbox/ipam/forms/model_forms.py
index 83bb42a4f..30ed2c530 100644
--- a/netbox/ipam/forms/model_forms.py
+++ b/netbox/ipam/forms/model_forms.py
@@ -749,7 +749,7 @@ class ServiceTemplateForm(NetBoxModelForm):
     comments = CommentField()
 
     fieldsets = (
-        FieldSet('name', 'protocol', 'ports', 'description', 'tags', name=_('Service Template')),
+        FieldSet('name', 'protocol', 'ports', 'description', 'tags', name=_('Application Service Template')),
     )
 
     class Meta:
@@ -794,7 +794,7 @@ class ServiceForm(NetBoxModelForm):
         FieldSet(
             'parent_object_type', 'parent', 'name',
             InlineFields('protocol', 'ports', label=_('Port(s)')),
-            'ipaddresses', 'description', 'tags', name=_('Service')
+            'ipaddresses', 'description', 'tags', name=_('Application Service')
         ),
     )
 
@@ -836,7 +836,7 @@ class ServiceForm(NetBoxModelForm):
 
 class ServiceCreateForm(ServiceForm):
     service_template = DynamicModelChoiceField(
-        label=_('Service template'),
+        label=_('Application Service template'),
         queryset=ServiceTemplate.objects.all(),
         required=False
     )
@@ -848,7 +848,7 @@ class ServiceCreateForm(ServiceForm):
                 FieldSet('service_template', name=_('From Template')),
                 FieldSet('name', 'protocol', 'ports', name=_('Custom')),
             ),
-            'ipaddresses', 'description', 'tags', name=_('Service')
+            'ipaddresses', 'description', 'tags', name=_('Application Service')
         ),
     )
 
@@ -877,4 +877,6 @@ class ServiceCreateForm(ServiceForm):
             if not self.cleaned_data['description']:
                 self.cleaned_data['description'] = service_template.description
         elif not all(self.cleaned_data[f] for f in ('name', 'protocol', 'ports')):
-            raise forms.ValidationError(_("Must specify name, protocol, and port(s) if not using a service template."))
+            raise forms.ValidationError(
+                _("Must specify name, protocol, and port(s) if not using an application service template.")
+            )
diff --git a/netbox/ipam/models/services.py b/netbox/ipam/models/services.py
index 000a8c764..c2c9ca444 100644
--- a/netbox/ipam/models/services.py
+++ b/netbox/ipam/models/services.py
@@ -84,7 +84,7 @@ class Service(ContactsMixin, ServiceBase, PrimaryModel):
         related_name='services',
         blank=True,
         verbose_name=_('IP addresses'),
-        help_text=_("The specific IP addresses (if any) to which this service is bound")
+        help_text=_("The specific IP addresses (if any) to which this application service is bound")
     )
 
     clone_fields = ['protocol', 'ports', 'description', 'parent', 'ipaddresses', ]