From 7b2082a2e446d5e36a5ad2915da68d4855bf4459 Mon Sep 17 00:00:00 2001
From: Lin Hua Cheng <lin-hua.cheng@hp.com>
Date: Thu, 21 Mar 2013 15:46:35 -0700
Subject: [PATCH] Made default values in templates translatable.

Fixes bug 1138183

Change-Id: I4a5d1f89e94b547bb0850020cb3fd4c03ec30179
---
 .../templates/routers/_detail_overview.html        |  2 +-
 .../images/_detail_overview.html                   | 14 +++++++-------
 .../templates/instances/_detail_overview.html      |  8 ++++++--
 .../templates/networks/_detail_overview.html       | 10 +++++-----
 .../templates/networks/ports/_detail_overview.html | 14 +++++++-------
 .../networks/subnets/_detail_overview.html         |  8 ++++----
 .../templates/routers/_detail_overview.html        |  8 ++++----
 7 files changed, 34 insertions(+), 30 deletions(-)

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 @@
 <div class="info detail">
   <dl>
     <dt>{% trans "Name" %}</dt>
-    <dd>{{ router.name|default:"None" }}</dd>
+    <dd>{{ router.name|default:_("None") }}</dd>
     <dt>{% trans "ID" %}</dt>
     <dd>{{ router.id }}</dd>
     <dt>{% trans "Project ID" %}</dt>
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 @@
   <hr class="header_rule">
   <dl>
     <dt>{% trans "Name" %}</dt>
-    <dd>{{ image.name|default:"None" }}</dd>
+    <dd>{{ image.name|default:_("None") }}</dd>
     <dt>{% trans "ID" %}</dt>
-    <dd>{{ image.id|default:"None" }}</dd>
+    <dd>{{ image.id|default:_("None") }}</dd>
     <dt>{% trans "Status" %}</dt>
-    <dd>{{ image.status|default:"Unknown"|title }}</dd>
+    <dd>{{ image.status|default:_("Unknown")|title }}</dd>
     <dt>{% trans "Public" %}</dt>
     <dd>{{ image.is_public }}</dd>
     <dt>{% trans "Checksum" %}</dt>
     <dd>{{ image.checksum }}</dd>
     <dt>{% trans "Created" %}</dt>
-    <dd>{{ image.created_at|default:"Unknown" }}</dd>
+    <dd>{{ image.created_at|default:_("Unknown") }}</dd>
     <dt>{% trans "Updated" %}</dt>
-    <dd>{{ image.updated_app|default:"Never updated" }}</dd>
+    <dd>{{ image.updated_app|default:_("Never updated") }}</dd>
   </dl>
 </div>
 
@@ -30,9 +30,9 @@
     <dt>{% trans "Size" %}</dt>
     <dd>{{ image.size|filesizeformat }}</dd>
     <dt>{% trans "Container Format" %}</dt>
-    <dd>{{ image.container_format|default:"None"|upper }}</dd>
+    <dd>{{ image.container_format|default:_("None")|upper }}</dd>
     <dt>{% trans "Disk Format" %}</dt>
-    <dd>{{ image.disk_format|default:"None"|upper }}</dd>
+    <dd>{{ image.disk_format|default:_("None")|upper }}</dd>
   </dl>
 </div>
 
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 @@
   <hr class="header_rule">
   <dl>
     <dt>{% trans "Key Name" %}</dt>
-    <dd>{{ instance.key_name|default:"<em>None</em>" }}</dd>
+    {% with default_key_name="<em>"|add:_("None")|add:"</em>" %}
+    <dd>{{ instance.key_name|default:default_key_name }}</dd>
+    {% endwith %}
     {% url horizon:project:images_and_snapshots:images:detail instance.image.id as image_url %}
     <dt>{% trans "Image Name" %}</dt>
     <dd><a href="{{ image_url }}">{{ instance.image_name }}</a></dd>
+    {% with default_item_value="<em>"|add:_("N/A")|add:"</em>" %}
     {% for key, value in instance.metadata.items %}
     <dt>{{ key|force_escape }}</dt>
-    <dd>{{ value|force_escape|default:"<em>N/A</em>" }}</dd>
+    <dd>{{ value|force_escape|default:default_item_value }}</dd>
     {% endfor%}
+    {% endwith %}
   </dl>
 </div>
 
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 @@
 <div class="info detail">
   <dl>
     <dt>{% trans "Name" %}</dt>
-    <dd>{{ network.name|default:"None" }}</dd>
+    <dd>{{ network.name|default:_("None") }}</dd>
     <dt>{% trans "ID" %}</dt>
-    <dd>{{ network.id|default:"None" }}</dd>
+    <dd>{{ network.id|default:_("None") }}</dd>
     <dt>{% trans "Project ID" %}</dt>
     <dd>{{ network.tenant_id|default:"-" }}</dd>
     <dt>{% trans "Status" %}</dt>
-    <dd>{{ network.status|default:"Unknown" }}</dd>
+    <dd>{{ network.status|default:_("Unknown") }}</dd>
     <dt>{% trans "Admin State" %}</dt>
-    <dd>{{ network.admin_state|default:"Unknown" }}</dd>
+    <dd>{{ network.admin_state|default:_("Unknown") }}</dd>
     <dt>{% trans "Shared" %}</dt>
     <dd>{{ network.shared|yesno|capfirst }}</dd>
     <dt>{% trans "External Network" %}</dt>
     <dd>{{ network.router__external|yesno|capfirst }}</dd>
     {% if network.provider__network_type %}
     <dt>{% trans "Provider Network" %}</dt>
-    <dd>{% trans "Network Type" %}: {{ network.provider__network_type|default:"Unknown" }}</dd>
+    <dd>{% trans "Network Type" %}: {{ network.provider__network_type|default:_("Unknown") }}</dd>
     <dd>{% trans "Physical Network" %}: {{ network.provider__physical_network|default:"-" }}</dd>
     <dd>{% trans "Segmentation ID" %}: {{ network.provider__segmentation_id|default:"-" }}</dd>
     {% 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 @@
   <hr class="header_rule">
   <dl>
     <dt>{% trans "Name" %}</dt>
-    <dd>{{ port.name|default:"None" }}</dd>
+    <dd>{{ port.name|default:_("None") }}</dd>
     <dt>{% trans "ID" %}</dt>
-    <dd>{{ port.id|default:"None" }}</dd>
+    <dd>{{ port.id|default:_("None") }}</dd>
     {% url horizon:project:networks:detail port.network_id as network_url %}
     <dt>{% trans "Network ID" %}</dt>
-    <dd><a href="{{ network_url }}">{{ port.network_id|default:"None" }}</a></dd>
+    <dd><a href="{{ network_url }}">{{ port.network_id|default:_("None") }}</a></dd>
     <dt>{% trans "Project ID" %}</dt>
     <dd>{{ port.tenant_id|default:"-" }}</dd>
     <dt>{% trans "Fixed IP" %}</dt>
@@ -27,14 +27,14 @@
       {% endif %}
     </dd>
     <dt>{% trans "Mac Address" %}</dt>
-    <dd>{{ port.mac_address|default:"None" }}</dd>
+    <dd>{{ port.mac_address|default:_("None") }}</dd>
     <dt>{% trans "Status" %}</dt>
-    <dd>{{ port.status|default:"None" }}</dd>
+    <dd>{{ port.status|default:_("None") }}</dd>
     <dt>{% trans "Admin State" %}</dt>
-    <dd>{{ port.admin_state|default:"None" }}</dd>
+    <dd>{{ port.admin_state|default:_("None") }}</dd>
     <dt>{% trans "Attached Device" %}</dt>
     {% if port.device_id|length > 1 or port.device_owner %}
-    <dd><b>{% trans "Device Owner" %}</b>: {{ port.device_owner|default:"None" }}</dd>
+    <dd><b>{% trans "Device Owner" %}</b>: {{ port.device_owner|default:_("None") }}</dd>
     <dd><b>{% trans "Device ID" %}</b>: {{ port.device_id|default:"-" }}</dd>
     {% else %}
     <dd>No attached device</dd>
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 @@
   <hr class="header_rule">
   <dl>
     <dt>{% trans "Name" %}</dt>
-    <dd>{{ subnet.name|default:"None" }}</dd>
+    <dd>{{ subnet.name|default:_("None") }}</dd>
     <dt>{% trans "ID" %}</dt>
-    <dd>{{ subnet.id|default:"None" }}</dd>
+    <dd>{{ subnet.id|default:_("None") }}</dd>
     {% url horizon:project:networks:detail subnet.network_id as network_url %}
     <dt>{% trans "Network ID" %}</dt>
-    <dd><a href="{{ network_url }}">{{ subnet.network_id|default:"None" }}</a></dd>
+    <dd><a href="{{ network_url }}">{{ subnet.network_id|default:_("None") }}</a></dd>
     <dt>{% trans "IP version" %}</dt>
     <dd>{{ subnet.ipver_str|default:"-" }}</dd>
     <dt>{% trans "CIDR" %}</dt>
-    <dd>{{ subnet.cidr|default:"None" }}</dd>
+    <dd>{{ subnet.cidr|default:_("None") }}</dd>
     <dt>{% trans "IP allocation pool" %}</dt>
     <dd>
       {% 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 %}
 
-<h3>{% trans "Router Overview" %}: {{router.name|default:"None" }}</h3>
+<h3>{% trans "Router Overview" %}: {{router.name|default:_("None") }}</h3>
 
 <div class="info detail">
   <dl>
     <dt>{% trans "Name" %}</dt>
-    <dd>{{ router.name|default:"None" }}</dd>
+    <dd>{{ router.name|default:_("None") }}</dd>
     <dt>{% trans "ID" %}</dt>
-    <dd>{{ router.id|default:"None" }}</dd>
+    <dd>{{ router.id|default:_("None") }}</dd>
     <dt>{% trans "Status" %}</dt>
-    <dd>{{ router.status|default:"Unknown" }}</dd>
+    <dd>{{ router.status|default:_("Unknown") }}</dd>
     {% if router.external_gateway_info %}
     <dt>{% trans "External Gateway Information" %}</dt>
     <dd>{% trans "Connected External Network" %}: