diff options
| author | Doug Fish <drfish@us.ibm.com> | 2014-10-21 16:54:07 -0500 |
|---|---|---|
| committer | Doug Fish <drfish@us.ibm.com> | 2014-10-29 14:13:42 +0000 |
| commit | d546fafd9440cc561f8fef6711b64ee807806ed0 (patch) | |
| tree | 5100a004017b28d627a932abab2c95b74920baf7 | |
| parent | 9e777f2530f3cecda97f4a0c2b261afe89dc295d (diff) | |
| download | horizon-d546fafd9440cc561f8fef6711b64ee807806ed0.tar.gz | |
Make status in instance details screen translatable
Use the same set of translations we have for status in the
instances table to make the status in the instance details
screen translatable.
Change-Id: I2430b9211e9f1aa2d067c74e577ba5905b261402
Closes-Bug: #1383916
(cherry picked from commit 055f737a9bbdd598148944a68f8512faafec0e52)
| -rw-r--r-- | openstack_dashboard/dashboards/project/instances/templates/instances/_detail_overview.html | 2 | ||||
| -rw-r--r-- | openstack_dashboard/dashboards/project/instances/views.py | 8 |
2 files changed, 9 insertions, 1 deletions
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 ff01beffd..83205c7a0 100644 --- a/openstack_dashboard/dashboards/project/instances/templates/instances/_detail_overview.html +++ b/openstack_dashboard/dashboards/project/instances/templates/instances/_detail_overview.html @@ -12,7 +12,7 @@ <dt>{% trans "ID" %}</dt> <dd>{{ instance.id }}</dd> <dt>{% trans "Status" %}</dt> - <dd>{{ instance.status|title }}</dd> + <dd>{{ instance.status_label|title }}</dd> <dt>{% trans "Availability Zone" %}</dt> <dd>{{ instance.availability_zone|default:"-" }}</dd> <dt>{% trans "Created" %}</dt> diff --git a/openstack_dashboard/dashboards/project/instances/views.py b/openstack_dashboard/dashboards/project/instances/views.py index 954e2e1d5..7d67a5d81 100644 --- a/openstack_dashboard/dashboards/project/instances/views.py +++ b/openstack_dashboard/dashboards/project/instances/views.py @@ -261,6 +261,14 @@ class DetailView(tabs.TabView): try: instance_id = self.kwargs['instance_id'] instance = api.nova.server_get(self.request, instance_id) + status_label = [label for (value, label) in + project_tables.STATUS_DISPLAY_CHOICES + if value.lower() == + (instance.status or '').lower()] + if status_label: + instance.status_label = status_label[0] + else: + instance.status_label = instance.status instance.volumes = api.nova.instance_volumes_list(self.request, instance_id) # Sort by device name |