diff --git a/openstack_dashboard/dashboards/project/database_backups/tables.py b/openstack_dashboard/dashboards/project/database_backups/tables.py index 4aafc93da0..38e8d09c0d 100644 --- a/openstack_dashboard/dashboards/project/database_backups/tables.py +++ b/openstack_dashboard/dashboards/project/database_backups/tables.py @@ -14,6 +14,7 @@ from django.core.urlresolvers import reverse from django.template import defaultfilters as d_filters +from django.utils.translation import pgettext_lazy from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ungettext_lazy @@ -31,6 +32,20 @@ STATUS_CHOICES = ( ("NEW", None), ("SAVING", None), ) +STATUS_DISPLAY_CHOICES = ( + ("BUILDING", pgettext_lazy("Current status of a Database Backup", + u"Building")), + ("COMPLETED", pgettext_lazy("Current status of a Database Backup", + u"Completed")), + ("DELETE_FAILED", pgettext_lazy("Current status of a Database Backup", + u"Delete Failed")), + ("FAILED", pgettext_lazy("Current status of a Database Backup", + u"Failed")), + ("NEW", pgettext_lazy("Current status of a Database Backup", + u"New")), + ("SAVING", pgettext_lazy("Current status of a Database Backup", + u"Saving")), +) class LaunchLink(tables.LinkAction): @@ -156,11 +171,10 @@ class BackupsTable(tables.DataTable): filters=(d_filters.yesno, d_filters.capfirst)) status = tables.Column("status", - filters=(d_filters.title, - filters.replace_underscores), verbose_name=_("Status"), status=True, - status_choices=STATUS_CHOICES) + status_choices=STATUS_CHOICES, + display_choices=STATUS_DISPLAY_CHOICES) class Meta(object): name = "backups" diff --git a/openstack_dashboard/dashboards/project/databases/tables.py b/openstack_dashboard/dashboards/project/databases/tables.py index 19a551c657..765e5b9ba1 100644 --- a/openstack_dashboard/dashboards/project/databases/tables.py +++ b/openstack_dashboard/dashboards/project/databases/tables.py @@ -14,6 +14,7 @@ from django.core import urlresolvers from django.template import defaultfilters as d_filters +from django.utils.translation import pgettext_lazy from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ungettext_lazy @@ -258,6 +259,29 @@ class InstancesTable(tables.DataTable): ("ERROR", False), ("RESTART_REQUIRED", None), ) + STATUS_DISPLAY_CHOICES = ( + ("ACTIVE", pgettext_lazy("Current status of a Database Instance", + u"Active")), + ("BLOCKED", pgettext_lazy("Current status of a Database Instance", + u"Blocked")), + ("BUILD", pgettext_lazy("Current status of a Database Instance", + u"Build")), + ("FAILED", pgettext_lazy("Current status of a Database Instance", + u"Failed")), + ("REBOOT", pgettext_lazy("Current status of a Database Instance", + u"Reboot")), + ("RESIZE", pgettext_lazy("Current status of a Database Instance", + u"Resize")), + ("BACKUP", pgettext_lazy("Current status of a Database Instance", + u"Backup")), + ("SHUTDOWN", pgettext_lazy("Current status of a Database Instance", + u"Shutdown")), + ("ERROR", pgettext_lazy("Current status of a Database Instance", + u"Error")), + ("RESTART_REQUIRED", + pgettext_lazy("Current status of a Database Instance", + u"Restart Required")), + ) name = tables.Column("name", link=("horizon:project:databases:detail"), verbose_name=_("Instance Name")) @@ -273,11 +297,10 @@ class InstancesTable(tables.DataTable): verbose_name=_("Volume Size"), attrs={'data-type': 'size'}) status = tables.Column("status", - filters=(d_filters.title, - filters.replace_underscores), verbose_name=_("Status"), status=True, - status_choices=STATUS_CHOICES) + status_choices=STATUS_CHOICES, + display_choices=STATUS_DISPLAY_CHOICES) class Meta(object): name = "databases" @@ -337,12 +360,12 @@ class InstanceBackupsTable(tables.DataTable): verbose_name=_("Incremental"), filters=(d_filters.yesno, d_filters.capfirst)) - status = tables.Column("status", - filters=(d_filters.title, - filters.replace_underscores), - verbose_name=_("Status"), - status=True, - status_choices=backup_tables.STATUS_CHOICES) + status = tables.Column( + "status", + verbose_name=_("Status"), + status=True, + status_choices=backup_tables.STATUS_CHOICES, + display_choices=backup_tables.STATUS_DISPLAY_CHOICES) class Meta(object): name = "backups"