Merge "made stack status value is translatable"
This commit is contained in:
commit
6a1e50853c
@ -13,6 +13,7 @@
|
||||
from django.core import urlresolvers
|
||||
from django.http import Http404 # noqa
|
||||
from django.template.defaultfilters import title # noqa
|
||||
from django.utils.translation import pgettext_lazy
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
from django.utils.translation import ungettext_lazy
|
||||
|
||||
@ -184,6 +185,68 @@ class StacksTable(tables.DataTable):
|
||||
("Complete", True),
|
||||
("Failed", False),
|
||||
)
|
||||
STACK_STATUS_DISPLAY_CHOICES = (
|
||||
("init_in_progress", pgettext_lazy("current status of stack",
|
||||
u"Init In Progress")),
|
||||
("init_complete", pgettext_lazy("current status of stack",
|
||||
u"Init Complete")),
|
||||
("init_failed", pgettext_lazy("current status of stack",
|
||||
u"Init Failed")),
|
||||
("create_in_progress", pgettext_lazy("current status of stack",
|
||||
u"Create In Progress")),
|
||||
("create_complete", pgettext_lazy("current status of stack",
|
||||
u"Create Complete")),
|
||||
("create_failed", pgettext_lazy("current status of stack",
|
||||
u"Create Failed")),
|
||||
("delete_in_progress", pgettext_lazy("current status of stack",
|
||||
u"Delete In Progress")),
|
||||
("delete_complete", pgettext_lazy("current status of stack",
|
||||
u"Delete Complete")),
|
||||
("delete_failed", pgettext_lazy("current status of stack",
|
||||
u"Delete Failed")),
|
||||
("update_in_progress", pgettext_lazy("current status of stack",
|
||||
u"Update In Progress")),
|
||||
("update_complete", pgettext_lazy("current status of stack",
|
||||
u"Update Complete")),
|
||||
("update_failed", pgettext_lazy("current status of stack",
|
||||
u"Update Failed")),
|
||||
("rollback_in_progress", pgettext_lazy("current status of stack",
|
||||
u"Rollback In Progress")),
|
||||
("rollback_complete", pgettext_lazy("current status of stack",
|
||||
u"Rollback Complete")),
|
||||
("rollback_failed", pgettext_lazy("current status of stack",
|
||||
u"Rollback Failed")),
|
||||
("suspend_in_progress", pgettext_lazy("current status of stack",
|
||||
u"Suspend In Progress")),
|
||||
("suspend_complete", pgettext_lazy("current status of stack",
|
||||
u"Suspend Complete")),
|
||||
("suspend_failed", pgettext_lazy("current status of stack",
|
||||
u"Suspend Failed")),
|
||||
("resume_in_progress", pgettext_lazy("current status of stack",
|
||||
u"Resume In Progress")),
|
||||
("resume_complete", pgettext_lazy("current status of stack",
|
||||
u"Resume Complete")),
|
||||
("resume_failed", pgettext_lazy("current status of stack",
|
||||
u"Resume Failed")),
|
||||
("adopt_in_progress", pgettext_lazy("current status of stack",
|
||||
u"Adopt In Progress")),
|
||||
("adopt_complete", pgettext_lazy("current status of stack",
|
||||
u"Adopt Complete")),
|
||||
("adopt_failed", pgettext_lazy("current status of stack",
|
||||
u"Adopt Failed")),
|
||||
("snapshot_in_progress", pgettext_lazy("current status of stack",
|
||||
u"Snapshot In Progress")),
|
||||
("snapshot_complete", pgettext_lazy("current status of stack",
|
||||
u"Snapshot Complete")),
|
||||
("snapshot_failed", pgettext_lazy("current status of stack",
|
||||
u"Snapshot Failed")),
|
||||
("check_in_progress", pgettext_lazy("current status of stack",
|
||||
u"Check In Progress")),
|
||||
("check_complete", pgettext_lazy("current status of stack",
|
||||
u"Check Complete")),
|
||||
("check_failed", pgettext_lazy("current status of stack",
|
||||
u"Check Failed")),
|
||||
)
|
||||
name = tables.Column("stack_name",
|
||||
verbose_name=_("Stack Name"),
|
||||
link="horizon:project:stacks:detail",)
|
||||
@ -201,8 +264,8 @@ class StacksTable(tables.DataTable):
|
||||
status_choices=STATUS_CHOICES)
|
||||
|
||||
stack_status = tables.Column("stack_status",
|
||||
filters=(title, filters.replace_underscores),
|
||||
verbose_name=_("Status"))
|
||||
verbose_name=_("Status"),
|
||||
display_choices=STACK_STATUS_DISPLAY_CHOICES)
|
||||
|
||||
def get_object_display(self, stack):
|
||||
return stack.stack_name
|
||||
|
Loading…
Reference in New Issue
Block a user