From 0a9a4fb4cc102aa4c3b574a4e704a121842943ea Mon Sep 17 00:00:00 2001 From: Wu Wenxiang Date: Wed, 4 Feb 2015 23:13:15 +0800 Subject: [PATCH] Make values for name&status about job_executions be translatable Add STATUS_DISPLAY_CHOICES in files: openstack_dashboard/dashboards/project/data_processing/job_executions/tables.py Change-Id: I38ce3f74e62afe30c1d8b9131fa81d64462c149d Partial-Bug: #1418027 --- .../data_processing/job_executions/tables.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/openstack_dashboard/dashboards/project/data_processing/job_executions/tables.py b/openstack_dashboard/dashboards/project/data_processing/job_executions/tables.py index 7ced61391a..2e0ac39a98 100644 --- a/openstack_dashboard/dashboards/project/data_processing/job_executions/tables.py +++ b/openstack_dashboard/dashboards/project/data_processing/job_executions/tables.py @@ -16,6 +16,7 @@ import logging from django.core.urlresolvers import reverse from django.http import Http404 # noqa from django.utils import http +from django.utils.translation import pgettext_lazy from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ungettext_lazy @@ -138,10 +139,21 @@ class JobExecutionsTable(tables.DataTable): ("KILLED", False), ("SUCCEEDED", True), ) + STATUS_DISPLAY_CHOICES = ( + ("DONEWITHERROR", pgettext_lazy("Current status of a Job Execution", + u"Done with Error")), + ("FAILED", pgettext_lazy("Current status of a Job Execution", + u"Failed")), + ("KILLED", pgettext_lazy("Current status of a Job Execution", + u"Killed")), + ("SUCCEEDED", pgettext_lazy("Current status of a Job Execution", + u"Succeeded")), + ) name = tables.Column("id", verbose_name=_("ID"), - display_choices=(("id", "ID"), ("name", "Name")), + display_choices=(("id", "ID"), + ("name", pgettext_lazy("Name")),), link=("horizon:project:data_processing." "job_executions:details")) job_name = tables.Column( @@ -155,6 +167,7 @@ class JobExecutionsTable(tables.DataTable): status = StatusColumn("info", status=True, status_choices=STATUS_CHOICES, + display_choices=STATUS_DISPLAY_CHOICES, verbose_name=_("Status")) def get_object_display(self, datum):