diff --git a/openstack_dashboard/dashboards/admin/routers/templates/routers/_detail_overview.html b/openstack_dashboard/dashboards/admin/routers/templates/routers/_detail_overview.html
index 43d86ded9..db0dc9297 100644
--- a/openstack_dashboard/dashboards/admin/routers/templates/routers/_detail_overview.html
+++ b/openstack_dashboard/dashboards/admin/routers/templates/routers/_detail_overview.html
@@ -5,7 +5,7 @@
- {% trans "Name" %}
- - {{ router.name|default:"None" }}
+ - {{ router.name|default:_("None") }}
- {% trans "ID" %}
- {{ router.id }}
- {% trans "Project ID" %}
diff --git a/openstack_dashboard/dashboards/project/images_and_snapshots/templates/images_and_snapshots/images/_detail_overview.html b/openstack_dashboard/dashboards/project/images_and_snapshots/templates/images_and_snapshots/images/_detail_overview.html
index 1e642eda5..0fbfcbe8f 100644
--- a/openstack_dashboard/dashboards/project/images_and_snapshots/templates/images_and_snapshots/images/_detail_overview.html
+++ b/openstack_dashboard/dashboards/project/images_and_snapshots/templates/images_and_snapshots/images/_detail_overview.html
@@ -7,19 +7,19 @@
- {% trans "Name" %}
- - {{ image.name|default:"None" }}
+ - {{ image.name|default:_("None") }}
- {% trans "ID" %}
- - {{ image.id|default:"None" }}
+ - {{ image.id|default:_("None") }}
- {% trans "Status" %}
- - {{ image.status|default:"Unknown"|title }}
+ - {{ image.status|default:_("Unknown")|title }}
- {% trans "Public" %}
- {{ image.is_public }}
- {% trans "Checksum" %}
- {{ image.checksum }}
- {% trans "Created" %}
- - {{ image.created_at|default:"Unknown" }}
+ - {{ image.created_at|default:_("Unknown") }}
- {% trans "Updated" %}
- - {{ image.updated_app|default:"Never updated" }}
+ - {{ image.updated_app|default:_("Never updated") }}
@@ -30,9 +30,9 @@
{% trans "Size" %}
{{ image.size|filesizeformat }}
{% trans "Container Format" %}
- {{ image.container_format|default:"None"|upper }}
+ {{ image.container_format|default:_("None")|upper }}
{% trans "Disk Format" %}
- {{ image.disk_format|default:"None"|upper }}
+ {{ image.disk_format|default:_("None")|upper }}
diff --git a/openstack_dashboard/dashboards/project/instances/templates/instances/_detail_overview.html b/openstack_dashboard/dashboards/project/instances/templates/instances/_detail_overview.html
index b91000d55..2c548612b 100644
--- a/openstack_dashboard/dashboards/project/instances/templates/instances/_detail_overview.html
+++ b/openstack_dashboard/dashboards/project/instances/templates/instances/_detail_overview.html
@@ -73,14 +73,18 @@
- {% trans "Key Name" %}
- - {{ instance.key_name|default:"None" }}
+ {% with default_key_name=""|add:_("None")|add:"" %}
+ - {{ instance.key_name|default:default_key_name }}
+ {% endwith %}
{% url horizon:project:images_and_snapshots:images:detail instance.image.id as image_url %}
- {% trans "Image Name" %}
- {{ instance.image_name }}
+ {% with default_item_value=""|add:_("N/A")|add:"" %}
{% for key, value in instance.metadata.items %}
- {{ key|force_escape }}
- - {{ value|force_escape|default:"N/A" }}
+ - {{ value|force_escape|default:default_item_value }}
{% endfor%}
+ {% endwith %}
diff --git a/openstack_dashboard/dashboards/project/networks/templates/networks/_detail_overview.html b/openstack_dashboard/dashboards/project/networks/templates/networks/_detail_overview.html
index b8c87a7a2..e3d07c42c 100644
--- a/openstack_dashboard/dashboards/project/networks/templates/networks/_detail_overview.html
+++ b/openstack_dashboard/dashboards/project/networks/templates/networks/_detail_overview.html
@@ -5,22 +5,22 @@
- {% trans "Name" %}
- - {{ network.name|default:"None" }}
+ - {{ network.name|default:_("None") }}
- {% trans "ID" %}
- - {{ network.id|default:"None" }}
+ - {{ network.id|default:_("None") }}
- {% trans "Project ID" %}
- {{ network.tenant_id|default:"-" }}
- {% trans "Status" %}
- - {{ network.status|default:"Unknown" }}
+ - {{ network.status|default:_("Unknown") }}
- {% trans "Admin State" %}
- - {{ network.admin_state|default:"Unknown" }}
+ - {{ network.admin_state|default:_("Unknown") }}
- {% trans "Shared" %}
- {{ network.shared|yesno|capfirst }}
- {% trans "External Network" %}
- {{ network.router__external|yesno|capfirst }}
{% if network.provider__network_type %}
- {% trans "Provider Network" %}
- - {% trans "Network Type" %}: {{ network.provider__network_type|default:"Unknown" }}
+ - {% trans "Network Type" %}: {{ network.provider__network_type|default:_("Unknown") }}
- {% trans "Physical Network" %}: {{ network.provider__physical_network|default:"-" }}
- {% trans "Segmentation ID" %}: {{ network.provider__segmentation_id|default:"-" }}
{% endif %}
diff --git a/openstack_dashboard/dashboards/project/networks/templates/networks/ports/_detail_overview.html b/openstack_dashboard/dashboards/project/networks/templates/networks/ports/_detail_overview.html
index 166fcd12d..8b3873307 100644
--- a/openstack_dashboard/dashboards/project/networks/templates/networks/ports/_detail_overview.html
+++ b/openstack_dashboard/dashboards/project/networks/templates/networks/ports/_detail_overview.html
@@ -7,12 +7,12 @@
- {% trans "Name" %}
- - {{ port.name|default:"None" }}
+ - {{ port.name|default:_("None") }}
- {% trans "ID" %}
- - {{ port.id|default:"None" }}
+ - {{ port.id|default:_("None") }}
{% url horizon:project:networks:detail port.network_id as network_url %}
- {% trans "Network ID" %}
- - {{ port.network_id|default:"None" }}
+ - {{ port.network_id|default:_("None") }}
- {% trans "Project ID" %}
- {{ port.tenant_id|default:"-" }}
- {% trans "Fixed IP" %}
@@ -27,14 +27,14 @@
{% endif %}
- {% trans "Mac Address" %}
- - {{ port.mac_address|default:"None" }}
+ - {{ port.mac_address|default:_("None") }}
- {% trans "Status" %}
- - {{ port.status|default:"None" }}
+ - {{ port.status|default:_("None") }}
- {% trans "Admin State" %}
- - {{ port.admin_state|default:"None" }}
+ - {{ port.admin_state|default:_("None") }}
- {% trans "Attached Device" %}
{% if port.device_id|length > 1 or port.device_owner %}
- - {% trans "Device Owner" %}: {{ port.device_owner|default:"None" }}
+ - {% trans "Device Owner" %}: {{ port.device_owner|default:_("None") }}
- {% trans "Device ID" %}: {{ port.device_id|default:"-" }}
{% else %}
- No attached device
diff --git a/openstack_dashboard/dashboards/project/networks/templates/networks/subnets/_detail_overview.html b/openstack_dashboard/dashboards/project/networks/templates/networks/subnets/_detail_overview.html
index 5aa9c1ad6..6f7834fb4 100644
--- a/openstack_dashboard/dashboards/project/networks/templates/networks/subnets/_detail_overview.html
+++ b/openstack_dashboard/dashboards/project/networks/templates/networks/subnets/_detail_overview.html
@@ -7,16 +7,16 @@
- {% trans "Name" %}
- - {{ subnet.name|default:"None" }}
+ - {{ subnet.name|default:_("None") }}
- {% trans "ID" %}
- - {{ subnet.id|default:"None" }}
+ - {{ subnet.id|default:_("None") }}
{% url horizon:project:networks:detail subnet.network_id as network_url %}
- {% trans "Network ID" %}
- - {{ subnet.network_id|default:"None" }}
+ - {{ subnet.network_id|default:_("None") }}
- {% trans "IP version" %}
- {{ subnet.ipver_str|default:"-" }}
- {% trans "CIDR" %}
- - {{ subnet.cidr|default:"None" }}
+ - {{ subnet.cidr|default:_("None") }}
- {% trans "IP allocation pool" %}
-
{% for pool in subnet.allocation_pools %}
diff --git a/openstack_dashboard/dashboards/project/routers/templates/routers/_detail_overview.html b/openstack_dashboard/dashboards/project/routers/templates/routers/_detail_overview.html
index c813801f8..226939f65 100644
--- a/openstack_dashboard/dashboards/project/routers/templates/routers/_detail_overview.html
+++ b/openstack_dashboard/dashboards/project/routers/templates/routers/_detail_overview.html
@@ -1,15 +1,15 @@
{% load i18n sizeformat parse_date %}
-
{% trans "Router Overview" %}: {{router.name|default:"None" }}
+{% trans "Router Overview" %}: {{router.name|default:_("None") }}
- {% trans "Name" %}
- - {{ router.name|default:"None" }}
+ - {{ router.name|default:_("None") }}
- {% trans "ID" %}
- - {{ router.id|default:"None" }}
+ - {{ router.id|default:_("None") }}
- {% trans "Status" %}
- - {{ router.status|default:"Unknown" }}
+ - {{ router.status|default:_("Unknown") }}
{% if router.external_gateway_info %}
- {% trans "External Gateway Information" %}
- {% trans "Connected External Network" %}: