From 7a80157e7511760b8d3a4e8153eaeb7eef09cf2d Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@netboxlabs.com>
Date: Fri, 28 Jul 2023 14:22:09 -0400
Subject: [PATCH] Shorten blocktranslate and endblocktranslate template tags

---
 netbox/templates/circuits/circuit_terminations_swap.html  | 2 +-
 netbox/templates/circuits/inc/circuit_termination.html    | 2 +-
 netbox/templates/core/datafile.html                       | 2 +-
 netbox/templates/core/job.html                            | 2 +-
 netbox/templates/dcim/bulk_disconnect.html                | 4 ++--
 netbox/templates/dcim/cable_trace.html                    | 4 ++--
 netbox/templates/dcim/consoleport_delete.html             | 4 ++--
 netbox/templates/dcim/consoleserverport_delete.html       | 4 ++--
 netbox/templates/dcim/device.html                         | 2 +-
 netbox/templates/dcim/devicebay_delete.html               | 4 ++--
 netbox/templates/dcim/devicebay_depopulate.html           | 4 ++--
 netbox/templates/dcim/devicetype/component_templates.html | 2 +-
 netbox/templates/dcim/inc/nonracked_devices.html          | 4 ++--
 netbox/templates/dcim/interface_delete.html               | 4 ++--
 netbox/templates/dcim/inventoryitem_delete.html           | 4 ++--
 netbox/templates/dcim/moduletype/component_templates.html | 2 +-
 netbox/templates/dcim/poweroutlet_delete.html             | 4 ++--
 netbox/templates/dcim/powerport_delete.html               | 4 ++--
 netbox/templates/dcim/rack/base.html                      | 2 +-
 netbox/templates/dcim/virtualchassis_add_member.html      | 2 +-
 netbox/templates/dcim/virtualchassis_edit.html            | 2 +-
 netbox/templates/dcim/virtualchassis_remove_member.html   | 2 +-
 netbox/templates/extras/configrevision_restore.html       | 2 +-
 netbox/templates/generic/bulk_add_component.html          | 2 +-
 netbox/templates/generic/bulk_delete.html                 | 2 +-
 netbox/templates/generic/bulk_edit.html                   | 2 +-
 netbox/templates/generic/bulk_remove.html                 | 8 ++++----
 netbox/templates/generic/bulk_rename.html                 | 2 +-
 netbox/templates/generic/object_delete.html               | 2 +-
 netbox/templates/generic/object_edit.html                 | 2 +-
 netbox/templates/generic/object_list.html                 | 2 +-
 netbox/templates/htmx/object_selector.html                | 2 +-
 netbox/templates/inc/missing_prerequisites.html           | 4 ++--
 netbox/templates/inc/paginator.html                       | 2 +-
 netbox/templates/inc/paginator_htmx.html                  | 2 +-
 netbox/templates/virtualization/cluster_add_devices.html  | 2 +-
 36 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/netbox/templates/circuits/circuit_terminations_swap.html b/netbox/templates/circuits/circuit_terminations_swap.html
index 1a7f15997..7c9094d42 100644
--- a/netbox/templates/circuits/circuit_terminations_swap.html
+++ b/netbox/templates/circuits/circuit_terminations_swap.html
@@ -4,7 +4,7 @@
 {% block title %}{% trans "Swap Circuit Terminations" %}{% endblock %}
 
 {% block message %}
-    <p>{% blocktranslate %}Swap these terminations for circuit {{ circuit }}?{% endblocktranslate %}</p>
+    <p>{% blocktrans %}Swap these terminations for circuit {{ circuit }}?{% endblocktrans %}</p>
     <ul>
         <li>
             <strong>{% trans "A side" %}:</strong>
diff --git a/netbox/templates/circuits/inc/circuit_termination.html b/netbox/templates/circuits/inc/circuit_termination.html
index feedc14a5..7ca83d265 100644
--- a/netbox/templates/circuits/inc/circuit_termination.html
+++ b/netbox/templates/circuits/inc/circuit_termination.html
@@ -23,7 +23,7 @@
                 </a>
             {% endif %}
         </div>
-        <h5>{% blocktranslate %}Termination {{ side }}{% endblocktranslate %}</h5>
+        <h5>{% blocktrans %}Termination {{ side }}{% endblocktrans %}</h5>
     </div>
     <div class="card-body">
       {% if termination %}
diff --git a/netbox/templates/core/datafile.html b/netbox/templates/core/datafile.html
index dfb9f3752..38316ddf6 100644
--- a/netbox/templates/core/datafile.html
+++ b/netbox/templates/core/datafile.html
@@ -49,7 +49,7 @@
             </tr>
             <tr>
               <th scope="row">{% trans "Size" %}</th>
-              <td>{% blocktranslate %}{{ object.size }} byte{{ object.size|pluralize }}{% endblocktranslate %}</td>
+              <td>{% blocktrans %}{{ object.size }} byte{{ object.size|pluralize }}{% endblocktrans %}</td>
             </tr>
             <tr>
               <th scope="row">{% trans "SHA256 Hash" %}</th>
diff --git a/netbox/templates/core/job.html b/netbox/templates/core/job.html
index e8b8c41b2..2f9703594 100644
--- a/netbox/templates/core/job.html
+++ b/netbox/templates/core/job.html
@@ -54,7 +54,7 @@
             </tr>
             <tr>
               <th scope="row">{% trans "Scheduled" %}</th>
-              <td>{{ object.scheduled|annotated_date|placeholder }}{% if object.interval %} ({% blocktranslate %}every {{ object.interval }} seconds{% endblocktranslate %}){% endif %}</td>
+              <td>{{ object.scheduled|annotated_date|placeholder }}{% if object.interval %} ({% blocktrans %}every {{ object.interval }} seconds{% endblocktrans %}){% endif %}</td>
             </tr>
             <tr>
               <th scope="row">{% trans "Started" %}</th>
diff --git a/netbox/templates/dcim/bulk_disconnect.html b/netbox/templates/dcim/bulk_disconnect.html
index c02e6ddfc..dcbba5b0c 100644
--- a/netbox/templates/dcim/bulk_disconnect.html
+++ b/netbox/templates/dcim/bulk_disconnect.html
@@ -2,10 +2,10 @@
 {% load helpers %}
 {% load i18n %}
 
-{% block title %}{% blocktranslate %}Disconnect" {{ obj_type_plural|bettertitle }}{% endblocktranslate %}{% endblock %}
+{% block title %}{% blocktrans %}Disconnect" {{ obj_type_plural|bettertitle }}{% endblocktrans %}{% endblock %}
 
 {% block message %}
-    <p>{% blocktranslate %}Are you sure you want to disconnect these {{ selected_objects|length }} {{ obj_type_plural }}?{% endblocktranslate %}</p>
+    <p>{% blocktrans %}Are you sure you want to disconnect these {{ selected_objects|length }} {{ obj_type_plural }}?{% endblocktrans %}</p>
     <ul>
         {% for obj in selected_objects %}
             <li>{{ obj }}</li>
diff --git a/netbox/templates/dcim/cable_trace.html b/netbox/templates/dcim/cable_trace.html
index 354bdf93e..b7d780cc4 100644
--- a/netbox/templates/dcim/cable_trace.html
+++ b/netbox/templates/dcim/cable_trace.html
@@ -2,7 +2,7 @@
 {% load helpers %}
 {% load i18n %}
 
-{% block title %}{% blocktranslate %}Cable Trace for {{ object|meta:"verbose_name"|bettertitle }} {{ object }}{% endblocktranslate %}{% endblock %}
+{% block title %}{% blocktrans %}Cable Trace for {{ object|meta:"verbose_name"|bettertitle }} {{ object }}{% endblocktrans %}{% endblock %}
 
 {% block content %}
     <div class="row">
@@ -28,7 +28,7 @@
                           {% with viewname=next_node|viewname:"trace" %}
                             <li>
                               <a href="{% url viewname pk=next_node.pk %}">{{ next_node|meta:"verbose_name"|bettertitle }} {{ next_node }}</a>
-                              ({% blocktranslate %}Cable {{ next_node.cable|linkify }}{% endblocktranslate %})
+                              ({% blocktrans %}Cable {{ next_node.cable|linkify }}{% endblocktrans %})
                             </li>
                           {% endwith %}
                         {% else %}
diff --git a/netbox/templates/dcim/consoleport_delete.html b/netbox/templates/dcim/consoleport_delete.html
index 4faf344d7..aaac38c5f 100644
--- a/netbox/templates/dcim/consoleport_delete.html
+++ b/netbox/templates/dcim/consoleport_delete.html
@@ -2,8 +2,8 @@
 {% load form_helpers %}
 {% load i18n %}
 
-{% block title %}{% blocktranslate %}Delete console port {{ consoleport }}?{% endblocktranslate %}{% endblock %}
+{% block title %}{% blocktrans %}Delete console port {{ consoleport }}?{% endblocktrans %}{% endblock %}
 
 {% block message %}
-    <p>{% blocktranslate %}Are you sure you want to delete this console port from <strong>{{ consoleport.device }}</strong>?{% endblocktranslate %}</p>
+    <p>{% blocktrans %}Are you sure you want to delete this console port from <strong>{{ consoleport.device }}</strong>?{% endblocktrans %}</p>
 {% endblock %}
diff --git a/netbox/templates/dcim/consoleserverport_delete.html b/netbox/templates/dcim/consoleserverport_delete.html
index 3fe493c5b..6a54d0ebe 100644
--- a/netbox/templates/dcim/consoleserverport_delete.html
+++ b/netbox/templates/dcim/consoleserverport_delete.html
@@ -2,8 +2,8 @@
 {% load form_helpers %}
 {% load i18n %}
 
-{% block title %}{% blocktranslate %}Delete console server port {{ consoleserverport }}?{% endblocktranslate %}{% endblock %}
+{% block title %}{% blocktrans %}Delete console server port {{ consoleserverport }}?{% endblocktrans %}{% endblock %}
 
 {% block message %}
-    <p>{% blocktranslate %}Are you sure you want to delete this console server port from <strong>{{ consoleserverport.device }}</strong>?{% endblocktranslate %}</p>
+    <p>{% blocktrans %}Are you sure you want to delete this console server port from <strong>{{ consoleserverport.device }}</strong>?{% endblocktrans %}</p>
 {% endblock %}
diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html
index de360f67d..cd2ba00ce 100644
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -295,7 +295,7 @@
                                     </tr>
                                     {% for leg in utilization.legs %}
                                         <tr>
-                                            <td style="padding-left: 20px">{% blocktranslate %}Leg {{ leg.name }}{% endblocktranslate %}</td>
+                                            <td style="padding-left: 20px">{% blocktrans %}Leg {{ leg.name }}{% endblocktrans %}</td>
                                             <td>{{ leg.outlet_count }}</td>
                                             <td>{{ leg.allocated }}</td>
                                             {% if powerfeed.available_power %}
diff --git a/netbox/templates/dcim/devicebay_delete.html b/netbox/templates/dcim/devicebay_delete.html
index 27c1cc556..47e2ba545 100644
--- a/netbox/templates/dcim/devicebay_delete.html
+++ b/netbox/templates/dcim/devicebay_delete.html
@@ -2,8 +2,8 @@
 {% load form_helpers %}
 {% load i18n %}
 
-{% block title %}{% blocktranslate %}Delete device bay {{ devicebay }}?{% endblocktranslate %}{% endblock %}
+{% block title %}{% blocktrans %}Delete device bay {{ devicebay }}?{% endblocktrans %}{% endblock %}
 
 {% block message %}
-    <p>{% blocktranslate %}Are you sure you want to delete this device bay from <strong>{{ devicebay.device }}</strong>?{% endblocktranslate %}</p>
+    <p>{% blocktrans %}Are you sure you want to delete this device bay from <strong>{{ devicebay.device }}</strong>?{% endblocktrans %}</p>
 {% endblock %}
diff --git a/netbox/templates/dcim/devicebay_depopulate.html b/netbox/templates/dcim/devicebay_depopulate.html
index 8f9629f22..8e201d1dd 100644
--- a/netbox/templates/dcim/devicebay_depopulate.html
+++ b/netbox/templates/dcim/devicebay_depopulate.html
@@ -2,8 +2,8 @@
 {% load form_helpers %}
 {% load i18n %}
 
-{% block title %}{% blocktranslate %}Remove {{ device_bay.installed_device }} from {{ device_bay }}?{% endblocktranslate %}{% endblock %}
+{% block title %}{% blocktrans %}Remove {{ device_bay.installed_device }} from {{ device_bay }}?{% endblocktrans %}{% endblock %}
 
 {% block message %}
-    <p>{% blocktranslate %}Are you sure you want to remove <strong>{{ device_bay.installed_device }}</strong> from <strong>{{ device_bay }}</strong>?{% endblocktranslate %}</p>
+    <p>{% blocktrans %}Are you sure you want to remove <strong>{{ device_bay.installed_device }}</strong> from <strong>{{ device_bay }}</strong>?{% endblocktrans %}</p>
 {% endblock %}
diff --git a/netbox/templates/dcim/devicetype/component_templates.html b/netbox/templates/dcim/devicetype/component_templates.html
index b075e1522..a2dcb6c0e 100644
--- a/netbox/templates/dcim/devicetype/component_templates.html
+++ b/netbox/templates/dcim/devicetype/component_templates.html
@@ -27,7 +27,7 @@
                 <div class="float-end">
                     <a href="{% url table.Meta.model|viewname:"add" %}?device_type={{ object.pk }}&return_url={{ return_url }}" class="btn btn-primary btn-sm">
                         <i class="mdi mdi-plus-thick" aria-hidden="true"></i>
-                        {% blocktranslate %}Add {{ title }}{% endblocktranslate %}
+                        {% blocktrans %}Add {{ title }}{% endblocktrans %}
                     </a>
                 </div>
                 <div class="clearfix"></div>
diff --git a/netbox/templates/dcim/inc/nonracked_devices.html b/netbox/templates/dcim/inc/nonracked_devices.html
index ec32395e8..08750fd49 100644
--- a/netbox/templates/dcim/inc/nonracked_devices.html
+++ b/netbox/templates/dcim/inc/nonracked_devices.html
@@ -34,11 +34,11 @@
         {%  if total_nonracked_devices_count > nonracked_devices.count %}
             {% if object|meta:'verbose_name' == 'site' %}
                 <div class="text-muted">
-                    {% blocktranslate %}Displaying {{ nonracked_devices.count }} of {{ total_nonracked_devices_count }} devices{% endblocktranslate %} (<a href="{% url 'dcim:device_list' %}?site_id={{ object.pk }}&rack_id=null">{% trans "View full list" %}</a>)
+                    {% blocktrans %}Displaying {{ nonracked_devices.count }} of {{ total_nonracked_devices_count }} devices{% endblocktrans %} (<a href="{% url 'dcim:device_list' %}?site_id={{ object.pk }}&rack_id=null">{% trans "View full list" %}</a>)
                 </div>
             {% elif object|meta:'verbose_name' == 'location' %}
                 <div class="text-muted">
-                    {% blocktranslate %}Displaying {{ nonracked_devices.count }} of {{ total_nonracked_devices_count }} devices{% endblocktranslate %} (<a href="{% url 'dcim:device_list' %}?location_id={{ object.pk }}&rack_id=null">{% trans "View full list" %}</a>)
+                    {% blocktrans %}Displaying {{ nonracked_devices.count }} of {{ total_nonracked_devices_count }} devices{% endblocktrans %} (<a href="{% url 'dcim:device_list' %}?location_id={{ object.pk }}&rack_id=null">{% trans "View full list" %}</a>)
                 </div>
             {% endif %}
         {% endif %}
diff --git a/netbox/templates/dcim/interface_delete.html b/netbox/templates/dcim/interface_delete.html
index ef378eb31..1a57f2a94 100644
--- a/netbox/templates/dcim/interface_delete.html
+++ b/netbox/templates/dcim/interface_delete.html
@@ -2,8 +2,8 @@
 {% load form_helpers %}
 {% load i18n %}
 
-{% block title %}{% blocktranslate %}Delete interface {{ interface }}?{% endblocktranslate %}{% endblock %}
+{% block title %}{% blocktrans %}Delete interface {{ interface }}?{% endblocktrans %}{% endblock %}
 
 {% block message %}
-    <p>{% blocktranslate %}Are you sure you want to delete this interface from <strong>{{ interface.device }}</strong>?{% endblocktranslate %}</p>
+    <p>{% blocktrans %}Are you sure you want to delete this interface from <strong>{{ interface.device }}</strong>?{% endblocktrans %}</p>
 {% endblock %}
diff --git a/netbox/templates/dcim/inventoryitem_delete.html b/netbox/templates/dcim/inventoryitem_delete.html
index 73a0fe27c..dc7a7e9fc 100644
--- a/netbox/templates/dcim/inventoryitem_delete.html
+++ b/netbox/templates/dcim/inventoryitem_delete.html
@@ -2,8 +2,8 @@
 {% load form_helpers %}
 {% load i18n %}
 
-{% block title %}{% blocktranslate %}Delete inventory item {{ inventoryitem }}?{% endblocktranslate %}{% endblock %}
+{% block title %}{% blocktrans %}Delete inventory item {{ inventoryitem }}?{% endblocktrans %}{% endblock %}
 
 {% block message %}
-    <p>{% blocktranslate %}Are you sure you want to delete this inventory item from <strong>{{ inventoryitem.device }}</strong>?{% endblocktranslate %}</p>
+    <p>{% blocktrans %}Are you sure you want to delete this inventory item from <strong>{{ inventoryitem.device }}</strong>?{% endblocktrans %}</p>
 {% endblock %}
diff --git a/netbox/templates/dcim/moduletype/component_templates.html b/netbox/templates/dcim/moduletype/component_templates.html
index 8acc6943d..63cc1bb99 100644
--- a/netbox/templates/dcim/moduletype/component_templates.html
+++ b/netbox/templates/dcim/moduletype/component_templates.html
@@ -27,7 +27,7 @@
                 <div class="float-end">
                     <a href="{% url table.Meta.model|viewname:"add" %}?module_type={{ object.pk }}&return_url={{ return_url }}" class="btn btn-primary btn-sm">
                         <i class="mdi mdi-plus-thick" aria-hidden="true"></i>
-                        {% blocktranslate %}Add {{ title }}{% endblocktranslate %}
+                        {% blocktrans %}Add {{ title }}{% endblocktrans %}
                     </a>
                 </div>
                 <div class="clearfix"></div>
diff --git a/netbox/templates/dcim/poweroutlet_delete.html b/netbox/templates/dcim/poweroutlet_delete.html
index 333a83006..a94c3ec36 100644
--- a/netbox/templates/dcim/poweroutlet_delete.html
+++ b/netbox/templates/dcim/poweroutlet_delete.html
@@ -2,8 +2,8 @@
 {% load form_helpers %}
 {% load i18n %}
 
-{% block title %}{% blocktranslate %}Delete power outlet {{ poweroutlet }}?{% endblocktranslate %}{% endblock %}
+{% block title %}{% blocktrans %}Delete power outlet {{ poweroutlet }}?{% endblocktrans %}{% endblock %}
 
 {% block message %}
-    <p>{% blocktranslate %}Are you sure you want to delete this power outlet from <strong>{{ poweroutlet.device }}</strong>?{% endblocktranslate %}</p>
+    <p>{% blocktrans %}Are you sure you want to delete this power outlet from <strong>{{ poweroutlet.device }}</strong>?{% endblocktrans %}</p>
 {% endblock %}
diff --git a/netbox/templates/dcim/powerport_delete.html b/netbox/templates/dcim/powerport_delete.html
index 02976399b..2997311a5 100644
--- a/netbox/templates/dcim/powerport_delete.html
+++ b/netbox/templates/dcim/powerport_delete.html
@@ -2,8 +2,8 @@
 {% load form_helpers %}
 {% load i18n %}
 
-{% block title %}{% blocktranslate %}Delete power port {{ powerport }}?{% endblocktranslate %}{% endblock %}
+{% block title %}{% blocktrans %}Delete power port {{ powerport }}?{% endblocktrans %}{% endblock %}
 
 {% block message %}
-    <p>{% blocktranslate %}Are you sure you want to delete this power port from <strong>{{ powerport.device }}</strong>?{% endblocktranslate %}</p>
+    <p>{% blocktrans %}Are you sure you want to delete this power port from <strong>{{ powerport.device }}</strong>?{% endblocktrans %}</p>
 {% endblock %}
diff --git a/netbox/templates/dcim/rack/base.html b/netbox/templates/dcim/rack/base.html
index fd1a96b9a..27ac284a2 100644
--- a/netbox/templates/dcim/rack/base.html
+++ b/netbox/templates/dcim/rack/base.html
@@ -1,7 +1,7 @@
 {% extends 'generic/object.html' %}
 {% load i18n %}
 
-{% block title %}{% blocktranslate %}Rack {{ object }}{% endblocktranslate %}{% endblock %}
+{% block title %}{% blocktrans %}Rack {{ object }}{% endblocktrans %}{% endblock %}
 
 {% block breadcrumbs %}
   {{ block.super }}
diff --git a/netbox/templates/dcim/virtualchassis_add_member.html b/netbox/templates/dcim/virtualchassis_add_member.html
index b3abb88ab..6f9b24183 100644
--- a/netbox/templates/dcim/virtualchassis_add_member.html
+++ b/netbox/templates/dcim/virtualchassis_add_member.html
@@ -2,7 +2,7 @@
 {% load form_helpers %}
 {% load i18n %}
 
-{% block title %}{% blocktranslate %}Add New Member to Virtual Chassis {{ virtual_chassis }}{% endblocktranslate %}{% endblock %}
+{% block title %}{% blocktrans %}Add New Member to Virtual Chassis {{ virtual_chassis }}{% endblocktrans %}{% endblock %}
 
 {% block content %}
     <form action="" method="post" enctype="multipart/form-data" class="form-object-edit">
diff --git a/netbox/templates/dcim/virtualchassis_edit.html b/netbox/templates/dcim/virtualchassis_edit.html
index 367060852..b1ffb56be 100644
--- a/netbox/templates/dcim/virtualchassis_edit.html
+++ b/netbox/templates/dcim/virtualchassis_edit.html
@@ -3,7 +3,7 @@
 {% load form_helpers %}
 {% load i18n %}
 
-{% block title %}{% blocktranslate %}Editing Virtual Chassis {{ vc_form.instance }}{% endblocktranslate %}{% endblock %}
+{% block title %}{% blocktrans %}Editing Virtual Chassis {{ vc_form.instance }}{% endblocktrans %}{% endblock %}
 
 {% block content-wrapper %}
   <div class="tab-content">
diff --git a/netbox/templates/dcim/virtualchassis_remove_member.html b/netbox/templates/dcim/virtualchassis_remove_member.html
index 11fc5bf0c..e16ec45da 100644
--- a/netbox/templates/dcim/virtualchassis_remove_member.html
+++ b/netbox/templates/dcim/virtualchassis_remove_member.html
@@ -5,5 +5,5 @@
 {% block title %}{% trans "Remove Virtual Chassis Member" %}?{% endblock %}
 
 {% block message %}
-    <p>{% blocktranslate %}Are you sure you want to remove <strong>{{ device }}</strong> from virtual chassis {{ device.virtual_chassis }}?{% endblocktranslate %}</p>
+    <p>{% blocktrans %}Are you sure you want to remove <strong>{{ device }}</strong> from virtual chassis {{ device.virtual_chassis }}?{% endblocktrans %}</p>
 {% endblock %}
diff --git a/netbox/templates/extras/configrevision_restore.html b/netbox/templates/extras/configrevision_restore.html
index 1f439a78a..bf39bbdbb 100644
--- a/netbox/templates/extras/configrevision_restore.html
+++ b/netbox/templates/extras/configrevision_restore.html
@@ -9,7 +9,7 @@
 
 {% block subtitle %}
   <div class="object-subtitle">
-    <span>{% blocktranslate %}Created {{ object.created|annotated_date }}{% endblocktranslate %}</span>
+    <span>{% blocktrans %}Created {{ object.created|annotated_date }}{% endblocktrans %}</span>
   </div>
 {% endblock %}
 
diff --git a/netbox/templates/generic/bulk_add_component.html b/netbox/templates/generic/bulk_add_component.html
index c7e3c3210..7fb4467c8 100644
--- a/netbox/templates/generic/bulk_add_component.html
+++ b/netbox/templates/generic/bulk_add_component.html
@@ -4,7 +4,7 @@
 {% load render_table from django_tables2 %}
 {% load i18n %}
 
-{% block title %}{% blocktranslate %}Add {{ model_name|title }}{% endblocktranslate %}{% endblock %}
+{% block title %}{% blocktrans %}Add {{ model_name|title }}{% endblocktrans %}{% endblock %}
 
 {% block tabs %}
   <ul class="nav nav-tabs px-3">
diff --git a/netbox/templates/generic/bulk_delete.html b/netbox/templates/generic/bulk_delete.html
index 381c8a3b3..00656750d 100644
--- a/netbox/templates/generic/bulk_delete.html
+++ b/netbox/templates/generic/bulk_delete.html
@@ -14,7 +14,7 @@ Context:
   return_url: The URL to which the user is redirected after submitting the form
 {% endcomment %}
 
-{% block title %}{% blocktranslate %}Delete {{ table.rows|length }} {{ model|meta:"verbose_name_plural"|bettertitle }}?{% endblocktranslate %}{% endblock %}
+{% block title %}{% blocktrans %}Delete {{ table.rows|length }} {{ model|meta:"verbose_name_plural"|bettertitle }}?{% endblocktrans %}{% endblock %}
 
 {% block content %}
   <div class="container-md px-0">
diff --git a/netbox/templates/generic/bulk_edit.html b/netbox/templates/generic/bulk_edit.html
index 699ec14f5..0064b57ae 100644
--- a/netbox/templates/generic/bulk_edit.html
+++ b/netbox/templates/generic/bulk_edit.html
@@ -12,7 +12,7 @@ Context:
   return_url: The URL to which the user is redirected after submitting the form
 {% endcomment %}
 
-{% block title %}{% blocktranslate %}Editing {{ table.rows|length }} {{ model|meta:"verbose_name_plural"|bettertitle }}{% endblocktranslate %}{% endblock %}
+{% block title %}{% blocktrans %}Editing {{ table.rows|length }} {{ model|meta:"verbose_name_plural"|bettertitle }}{% endblocktrans %}{% endblock %}
 
 {% block tabs %}
   <ul class="nav nav-tabs px-3">
diff --git a/netbox/templates/generic/bulk_remove.html b/netbox/templates/generic/bulk_remove.html
index c66a1e291..e73fb994f 100644
--- a/netbox/templates/generic/bulk_remove.html
+++ b/netbox/templates/generic/bulk_remove.html
@@ -3,15 +3,15 @@
 {% load render_table from django_tables2 %}
 {% load i18n %}
 
-{% block title %}{% blocktranslate %}Remove {{ table.rows|length }} {{ obj_type_plural|bettertitle }}?{% endblocktranslate %}{% endblock %}
+{% block title %}{% blocktrans %}Remove {{ table.rows|length }} {{ obj_type_plural|bettertitle }}?{% endblocktrans %}{% endblock %}
 
 {% block content %}
 <div class="container-md px-0">
   <div class="alert alert-danger" role="alert">
     <h4 class="alert-heading">{% trans "Confirm Bulk Removal" %}</h4>
-    <p><strong>{% blocktranslate %}Warning:</strong> The following operation will remove {{ table.rows|length }} {{ obj_type_plural }} from {{ parent_obj }}.{% endblocktranslate %}</p>
+    <p><strong>{% blocktrans %}Warning:</strong> The following operation will remove {{ table.rows|length }} {{ obj_type_plural }} from {{ parent_obj }}.{% endblocktrans %}</p>
     <hr />
-    <p class="mb-0">{% blocktranslate %}Please carefully review the {{ obj_type_plural }} to be removed and confirm below.{% endblocktranslate %}</p>
+    <p class="mb-0">{% blocktrans %}Please carefully review the {{ obj_type_plural }} to be removed and confirm below.{% endblocktrans %}</p>
   </div>
 </div>
 <div class="container-xl px-0">
@@ -24,7 +24,7 @@
       {{ field }}
     {% endfor %}
     <div class="text-center">
-      <button type="submit" name="_confirm" class="btn btn-danger">{% blocktranslate %}Delete these {{ table.rows|length }} {{ obj_type_plural }}{% endblocktranslate %}</button>
+      <button type="submit" name="_confirm" class="btn btn-danger">{% blocktrans %}Delete these {{ table.rows|length }} {{ obj_type_plural }}{% endblocktrans %}</button>
       <a href="{{ return_url }}" class="btn btn-outline-dark">{% trans "Cancel" %}</a>
     </div>
   </form>
diff --git a/netbox/templates/generic/bulk_rename.html b/netbox/templates/generic/bulk_rename.html
index d5d0e3798..49f826dc3 100644
--- a/netbox/templates/generic/bulk_rename.html
+++ b/netbox/templates/generic/bulk_rename.html
@@ -3,7 +3,7 @@
 {% load form_helpers %}
 {% load i18n %}
 
-{% block title %}{% blocktranslate %}Renaming {{ selected_objects|length }} {{ obj_type_plural|bettertitle }}{% endblocktranslate %}{% endblock %}
+{% block title %}{% blocktrans %}Renaming {{ selected_objects|length }} {{ obj_type_plural|bettertitle }}{% endblocktrans %}{% endblock %}
 
 {% block content %}
 <div class="row mb-3">
diff --git a/netbox/templates/generic/object_delete.html b/netbox/templates/generic/object_delete.html
index 8367eb475..e90ac3062 100644
--- a/netbox/templates/generic/object_delete.html
+++ b/netbox/templates/generic/object_delete.html
@@ -11,7 +11,7 @@ Context:
   return_url: The URL to which the user is redirected after submitting the form
 {% endcomment %}
 
-{% block title %}{% blocktranslate %}Delete {{ object|meta:"verbose_name" }}?{% endblocktranslate %}{% endblock %}
+{% block title %}{% blocktrans %}Delete {{ object|meta:"verbose_name" }}?{% endblocktrans %}{% endblock %}
 
 {% block header %}{% endblock %}
 
diff --git a/netbox/templates/generic/object_edit.html b/netbox/templates/generic/object_edit.html
index 804807d08..8040df1d4 100644
--- a/netbox/templates/generic/object_edit.html
+++ b/netbox/templates/generic/object_edit.html
@@ -13,7 +13,7 @@ Context:
 {% endcomment %}
 
 {% block title %}
-  {% if object.pk %}{% blocktranslate %}Editing {{ object|meta:"verbose_name" }} {{ object }}{% endblocktranslate %}{% else %}{% blocktranslate %}Add a new {{ object|meta:"verbose_name" }}{% endblocktranslate %}{% endif %}
+  {% if object.pk %}{% blocktrans %}Editing {{ object|meta:"verbose_name" }} {{ object }}{% endblocktrans %}{% else %}{% blocktrans %}Add a new {{ object|meta:"verbose_name" }}{% endblocktrans %}{% endif %}
 {% endblock title %}
 
 {% block tabs %}
diff --git a/netbox/templates/generic/object_list.html b/netbox/templates/generic/object_list.html
index 52634b1ff..008082ca7 100644
--- a/netbox/templates/generic/object_list.html
+++ b/netbox/templates/generic/object_list.html
@@ -91,7 +91,7 @@ Context:
                 <div class="form-check">
                   <input type="checkbox" id="select-all" name="_all" class="form-check-input" />
                   <label for="select-all" class="form-check-label">
-                    {% blocktranslate %}Select <strong>all {{ table.rows|length }} {{ table.data.verbose_name_plural }}</strong> matching query{% endblocktranslate %}
+                    {% blocktrans %}Select <strong>all {{ table.rows|length }} {{ table.data.verbose_name_plural }}</strong> matching query{% endblocktrans %}
                   </label>
                 </div>
               </div>
diff --git a/netbox/templates/htmx/object_selector.html b/netbox/templates/htmx/object_selector.html
index 50dfb561a..be7f93468 100644
--- a/netbox/templates/htmx/object_selector.html
+++ b/netbox/templates/htmx/object_selector.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 
 <div class="modal-header">
-  <h5 class="modal-title">{% blocktranslate %}Select {{ model|meta:"verbose_name"|bettertitle }}{% endblocktranslate %}</h5>
+  <h5 class="modal-title">{% blocktrans %}Select {{ model|meta:"verbose_name"|bettertitle }}{% endblocktrans %}</h5>
   <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
 </div>
 <div class="modal-body row">
diff --git a/netbox/templates/inc/missing_prerequisites.html b/netbox/templates/inc/missing_prerequisites.html
index efd5b878f..bf310df11 100644
--- a/netbox/templates/inc/missing_prerequisites.html
+++ b/netbox/templates/inc/missing_prerequisites.html
@@ -3,8 +3,8 @@
 
 <div class="alert alert-warning text-end" role="alert">
   <div class="float-start">
-    <i class="mdi mdi-alert"></i> {% blocktranslate %}Before you can add a {{ model|meta:"verbose_name" }} you must first create a
-      <strong>{{ prerequisite_model|meta:"verbose_name" }}</strong>.{% endblocktranslate %}
+    <i class="mdi mdi-alert"></i> {% blocktrans %}Before you can add a {{ model|meta:"verbose_name" }} you must first create a
+      <strong>{{ prerequisite_model|meta:"verbose_name" }}</strong>.{% endblocktrans %}
   </div>
   {% add_button prerequisite_model %}
 </div>
diff --git a/netbox/templates/inc/paginator.html b/netbox/templates/inc/paginator.html
index 3a3ea43e2..d6047d0b8 100644
--- a/netbox/templates/inc/paginator.html
+++ b/netbox/templates/inc/paginator.html
@@ -46,7 +46,7 @@
         </ul>
       </div>
       <small class="text-end text-muted">
-        {% blocktranslate %}Showing {{ page.start_index }}-{{ page.end_index }} of {{ page.paginator.count }}{% endblocktranslate %}
+        {% blocktrans %}Showing {{ page.start_index }}-{{ page.end_index }} of {{ page.paginator.count }}{% endblocktrans %}
       </small>
     {% endif %}
   </div>
diff --git a/netbox/templates/inc/paginator_htmx.html b/netbox/templates/inc/paginator_htmx.html
index 5e0ec9e22..6fde58ab6 100644
--- a/netbox/templates/inc/paginator_htmx.html
+++ b/netbox/templates/inc/paginator_htmx.html
@@ -66,7 +66,7 @@
         </ul>
       </div>
       <small class="text-end text-muted">
-        {% blocktranslate %}Showing {{ page.start_index }}-{{ page.end_index }} of {{ page.paginator.count }}{% endblocktranslate %}
+        {% blocktrans %}Showing {{ page.start_index }}-{{ page.end_index }} of {{ page.paginator.count }}{% endblocktrans %}
       </small>
     {% endif %}
   </div>
diff --git a/netbox/templates/virtualization/cluster_add_devices.html b/netbox/templates/virtualization/cluster_add_devices.html
index 7cdfa39ec..97d3e4200 100644
--- a/netbox/templates/virtualization/cluster_add_devices.html
+++ b/netbox/templates/virtualization/cluster_add_devices.html
@@ -5,7 +5,7 @@
 
 {% render_errors form %}
 
-{% block title %}{% blocktranslate %}Add Device to Cluster {{ cluster }}{% endblocktranslate %}{% endblock %}
+{% block title %}{% blocktrans %}Add Device to Cluster {{ cluster }}{% endblocktrans %}{% endblock %}
 
 {% block content %}
     <form action="." method="post">