+ {% blocktrans with device=device_bay.installed_device %}
+ Are you sure you want to remove {{ device }} from {{ device_bay }} ?
+ {% endblocktrans %}
+
{% endblock %}
diff --git a/netbox/templates/dcim/inc/nonracked_devices.html b/netbox/templates/dcim/inc/nonracked_devices.html
index 88a37987b..f6a427d25 100644
--- a/netbox/templates/dcim/inc/nonracked_devices.html
+++ b/netbox/templates/dcim/inc/nonracked_devices.html
@@ -34,11 +34,17 @@
{% if total_nonracked_devices_count > nonracked_devices.count %}
{% if object|meta:'verbose_name' == 'site' %}
- {% blocktrans %}Displaying {{ nonracked_devices.count }} of {{ total_nonracked_devices_count }} devices{% endblocktrans %} (
{% trans "View full list" %} )
+ {% blocktrans with count=nonracked_devices.count total=total_nonracked_devices_count %}
+ Displaying {{ count }} of {{ total }} devices
+ {% endblocktrans %}
+ (
{% trans "View full list" %} )
{% elif object|meta:'verbose_name' == 'location' %}
- {% blocktrans %}Displaying {{ nonracked_devices.count }} of {{ total_nonracked_devices_count }} devices{% endblocktrans %} (
{% trans "View full list" %} )
+ {% blocktrans with count=nonracked_devices.count total=total_nonracked_devices_count %}
+ Displaying {{ count }} of {{ total }} devices
+ {% endblocktrans %}
+ (
{% trans "View full list" %} )
{% endif %}
{% endif %}
diff --git a/netbox/templates/dcim/virtualchassis_edit.html b/netbox/templates/dcim/virtualchassis_edit.html
index b1ffb56be..cfc3de2ec 100644
--- a/netbox/templates/dcim/virtualchassis_edit.html
+++ b/netbox/templates/dcim/virtualchassis_edit.html
@@ -3,7 +3,11 @@
{% load form_helpers %}
{% load i18n %}
-{% block title %}{% blocktrans %}Editing Virtual Chassis {{ vc_form.instance }}{% endblocktrans %}{% endblock %}
+{% block title %}
+ {% blocktrans with name=vc_form.instance %}
+ Editing Virtual Chassis {{ name }}
+ {% endblocktrans %}
+{% endblock %}
{% block content-wrapper %}
diff --git a/netbox/templates/dcim/virtualchassis_remove_member.html b/netbox/templates/dcim/virtualchassis_remove_member.html
index e16ec45da..520f3d862 100644
--- a/netbox/templates/dcim/virtualchassis_remove_member.html
+++ b/netbox/templates/dcim/virtualchassis_remove_member.html
@@ -5,5 +5,9 @@
{% block title %}{% trans "Remove Virtual Chassis Member" %}?{% endblock %}
{% block message %}
-
{% blocktrans %}Are you sure you want to remove {{ device }} from virtual chassis {{ device.virtual_chassis }}?{% endblocktrans %}
+
+ {% blocktrans with name=device.virtual_chassis %}
+ Are you sure you want to remove {{ device }} from virtual chassis {{ name }}?
+ {% endblocktrans %}
+
{% endblock %}
diff --git a/netbox/templates/extras/configrevision_restore.html b/netbox/templates/extras/configrevision_restore.html
index bf39bbdbb..134a0b547 100644
--- a/netbox/templates/extras/configrevision_restore.html
+++ b/netbox/templates/extras/configrevision_restore.html
@@ -9,7 +9,7 @@
{% block subtitle %}
- {% blocktrans %}Created {{ object.created|annotated_date }}{% endblocktrans %}
+ {% trans "Created" %} {{ object.created|annotated_date }}
{% endblock %}
diff --git a/netbox/templates/generic/bulk_add_component.html b/netbox/templates/generic/bulk_add_component.html
index 7fb4467c8..5f0979f3b 100644
--- a/netbox/templates/generic/bulk_add_component.html
+++ b/netbox/templates/generic/bulk_add_component.html
@@ -4,7 +4,9 @@
{% load render_table from django_tables2 %}
{% load i18n %}
-{% block title %}{% blocktrans %}Add {{ model_name|title }}{% endblocktrans %}{% endblock %}
+{% block title %}
+ {% trans "Add" %} {{ model_name|title }}
+{% endblock %}
{% block tabs %}
diff --git a/netbox/templates/generic/bulk_delete.html b/netbox/templates/generic/bulk_delete.html
index 00656750d..58b0e83ee 100644
--- a/netbox/templates/generic/bulk_delete.html
+++ b/netbox/templates/generic/bulk_delete.html
@@ -14,7 +14,9 @@ Context:
return_url: The URL to which the user is redirected after submitting the form
{% endcomment %}
-{% block title %}{% blocktrans %}Delete {{ table.rows|length }} {{ model|meta:"verbose_name_plural"|bettertitle }}?{% endblocktrans %}{% endblock %}
+{% block title %}
+ {% trans "Delete" %} {{ table.rows|length }} {{ model|meta:"verbose_name_plural"|bettertitle }}?
+{% endblock %}
{% block content %}
diff --git a/netbox/templates/generic/bulk_edit.html b/netbox/templates/generic/bulk_edit.html
index 0064b57ae..3783c990e 100644
--- a/netbox/templates/generic/bulk_edit.html
+++ b/netbox/templates/generic/bulk_edit.html
@@ -12,7 +12,9 @@ Context:
return_url: The URL to which the user is redirected after submitting the form
{% endcomment %}
-{% block title %}{% blocktrans %}Editing {{ table.rows|length }} {{ model|meta:"verbose_name_plural"|bettertitle }}{% endblocktrans %}{% endblock %}
+{% block title %}
+ {% trans "Editing" %} {{ table.rows|length }} {{ model|meta:"verbose_name_plural"|bettertitle }}
+{% endblock %}
{% block tabs %}
diff --git a/netbox/templates/generic/bulk_remove.html b/netbox/templates/generic/bulk_remove.html
index e73fb994f..2691fbd3a 100644
--- a/netbox/templates/generic/bulk_remove.html
+++ b/netbox/templates/generic/bulk_remove.html
@@ -3,15 +3,25 @@
{% load render_table from django_tables2 %}
{% load i18n %}
-{% block title %}{% blocktrans %}Remove {{ table.rows|length }} {{ obj_type_plural|bettertitle }}?{% endblocktrans %}{% endblock %}
+{% block title %}
+ {% trans "Remove" %} {{ table.rows|length }} {{ obj_type_plural|bettertitle }}?
+{% endblock %}
{% block content %}
{% trans "Confirm Bulk Removal" %}
-
{% blocktrans %}Warning: The following operation will remove {{ table.rows|length }} {{ obj_type_plural }} from {{ parent_obj }}.{% endblocktrans %}
+
+ {% blocktrans with count=table.rows|length %}
+ Warning: The following operation will remove {{ count }} {{ obj_type_plural }} from {{ parent_obj }}.
+ {% endblocktrans %}
+
-
{% blocktrans %}Please carefully review the {{ obj_type_plural }} to be removed and confirm below.{% endblocktrans %}
+
+ {% blocktrans %}
+ Please carefully review the {{ obj_type_plural }} to be removed and confirm below.
+ {% endblocktrans %}
+
@@ -24,7 +34,11 @@
{{ field }}
{% endfor %}
-
{% blocktrans %}Delete these {{ table.rows|length }} {{ obj_type_plural }}{% endblocktrans %}
+
+ {% blocktrans with count=table.rows|length %}
+ Delete these {{ count }} {{ obj_type_plural }}
+ {% endblocktrans %}
+
{% trans "Cancel" %}
diff --git a/netbox/templates/generic/bulk_rename.html b/netbox/templates/generic/bulk_rename.html
index 49f826dc3..6b7af6789 100644
--- a/netbox/templates/generic/bulk_rename.html
+++ b/netbox/templates/generic/bulk_rename.html
@@ -3,7 +3,9 @@
{% load form_helpers %}
{% load i18n %}
-{% block title %}{% blocktrans %}Renaming {{ selected_objects|length }} {{ obj_type_plural|bettertitle }}{% endblocktrans %}{% endblock %}
+{% block title %}
+ {% trans "Renaming" %} {{ selected_objects|length }} {{ obj_type_plural|bettertitle }}
+{% endblock %}
{% block content %}
diff --git a/netbox/templates/htmx/delete_form.html b/netbox/templates/htmx/delete_form.html
index 895c27b45..d0fba9d36 100644
--- a/netbox/templates/htmx/delete_form.html
+++ b/netbox/templates/htmx/delete_form.html
@@ -7,7 +7,11 @@
{% trans "Confirm Deletion" %}
-
{% blocktrans %}Are you sure you want to delete {{ object_type }} {{ object }} ?{% endblocktrans %}
+
+ {% blocktrans %}
+ Are you sure you want to delete {{ object_type }} {{ object }} ?
+ {% endblocktrans %}
+
{% render_form form %}
diff --git a/netbox/templates/inc/paginator_htmx.html b/netbox/templates/inc/paginator_htmx.html
index 6fde58ab6..4c59ff48d 100644
--- a/netbox/templates/inc/paginator_htmx.html
+++ b/netbox/templates/inc/paginator_htmx.html
@@ -66,7 +66,9 @@
- {% blocktrans %}Showing {{ page.start_index }}-{{ page.end_index }} of {{ page.paginator.count }}{% endblocktrans %}
+ {% blocktrans with start=page.start_index end=page.end_index total=page.paginator.count %}
+ Showing {{ start }}-{{ end }} of {{ total }}
+ {% endblocktrans %}
{% endif %}
diff --git a/netbox/templates/virtualization/cluster_add_devices.html b/netbox/templates/virtualization/cluster_add_devices.html
index 97d3e4200..0116bbdff 100644
--- a/netbox/templates/virtualization/cluster_add_devices.html
+++ b/netbox/templates/virtualization/cluster_add_devices.html
@@ -5,7 +5,11 @@
{% render_errors form %}
-{% block title %}{% blocktrans %}Add Device to Cluster {{ cluster }}{% endblocktrans %}{% endblock %}
+{% block title %}
+ {% blocktrans %}
+ Add Device to Cluster {{ cluster }}
+ {% endblocktrans %}
+{% endblock %}
{% block content %}