Merge "Fix concatenation in Volume related actions"

openstack_dashboard/dashboards/admin/volumes/volume_types/extras/tables.py

@@ -12,6 +12,7 @@
 
 from django.core.urlresolvers import reverse
 from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import ungettext_lazy
 
 from horizon import tables
 
@@ -19,8 +20,22 @@ from openstack_dashboard import api
 
 
 class ExtraSpecDelete(tables.DeleteAction):
-    data_type_singular = _("Extra Spec")
-    data_type_plural = _("Extra Specs")
+
+    @staticmethod
+    def action_present(count):
+        return ungettext_lazy(
+            u"Delete Extra Spec",
+            u"Delete Extra Specs",
+            count
+        )
+
+    @staticmethod
+    def action_past(count):
+        return ungettext_lazy(
+            u"Deleted Extra Spec",
+            u"Deleted Extra Specs",
+            count
+        )
 
     def delete(self, request, obj_ids):
         api.cinder.volume_type_extra_delete(request,

openstack_dashboard/dashboards/admin/volumes/volume_types/tables.py

@@ -12,6 +12,7 @@
 
 from django.template import defaultfilters as filters
 from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import ungettext_lazy
 
 from horizon import tables
 
@@ -45,8 +46,21 @@ class ManageQosSpecAssociation(tables.LinkAction):
 
 
 class DeleteVolumeType(tables.DeleteAction):
-    data_type_singular = _("Volume Type")
-    data_type_plural = _("Volume Types")
+    @staticmethod
+    def action_present(count):
+        return ungettext_lazy(
+            u"Delete VolumeType",
+            u"Delete VolumeTypes",
+            count
+        )
+
+    @staticmethod
+    def action_past(count):
+        return ungettext_lazy(
+            u"Deleted VolumeType",
+            u"Deleted VolumeTypes",
+            count
+        )
     policy_rules = (("volume", "volume_extension:types_manage"),)
 
     def delete(self, request, obj_id):
@@ -98,8 +112,21 @@ class CreateQosSpec(tables.LinkAction):
 
 
 class DeleteQosSpecs(tables.DeleteAction):
-    data_type_singular = _("QOS Spec")
-    data_type_plural = _("QOS Specs")
+    @staticmethod
+    def action_present(count):
+        return ungettext_lazy(
+            u"Delete QOS Spec",
+            u"Delete QOS Specs",
+            count
+        )
+
+    @staticmethod
+    def action_past(count):
+        return ungettext_lazy(
+            u"Deleted QOS Spec",
+            u"Deleted QOS Specs",
+            count
+        )
     policy_rules = (("volume", "volume_extension:types_manage"),)
 
     def delete(self, request, qos_spec_id):

openstack_dashboard/dashboards/project/volumes/snapshots/tables.py

@@ -17,6 +17,7 @@ from django.utils import html
 from django.utils.http import urlencode
 from django.utils import safestring
 from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import ungettext_lazy
 
 from horizon import tables
 
@@ -49,9 +50,22 @@ class LaunchSnapshot(volume_tables.LaunchVolume):
 
 
 class DeleteVolumeSnapshot(policy.PolicyTargetMixin, tables.DeleteAction):
-    data_type_singular = _("Volume Snapshot")
-    data_type_plural = _("Volume Snapshots")
-    action_past = _("Scheduled deletion of %(data_type)s")
+    @staticmethod
+    def action_present(count):
+        return ungettext_lazy(
+            u"Delete Volume Snapshot",
+            u"Delete Volume Snapshots",
+            count
+        )
+
+    @staticmethod
+    def action_past(count):
+        return ungettext_lazy(
+            u"Scheduled deletion of Volume Snapshot",
+            u"Scheduled deletion of Volume Snapshots",
+            count
+        )
+
     policy_rules = (("volume", "volume:delete_snapshot"),)
     policy_target_attrs = (("project_id",
                             'os-extended-snapshot-attributes:project_id'),)

openstack_dashboard/dashboards/project/volumes/volumes/tables.py

@@ -21,6 +21,7 @@ from django.utils.http import urlencode
 from django.utils import safestring
 from django.utils.translation import string_concat  # noqa
 from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import ungettext_lazy
 
 from horizon import exceptions
 from horizon import tables
@@ -60,9 +61,22 @@ class LaunchVolume(tables.LinkAction):
 
 
 class DeleteVolume(VolumePolicyTargetMixin, tables.DeleteAction):
-    data_type_singular = _("Volume")
-    data_type_plural = _("Volumes")
-    action_past = _("Scheduled deletion of %(data_type)s")
+    @staticmethod
+    def action_present(count):
+        return ungettext_lazy(
+            u"Delete Volume",
+            u"Delete Volumes",
+            count
+        )
+
+    @staticmethod
+    def action_past(count):
+        return ungettext_lazy(
+            u"Scheduled deletion of Volume",
+            u"Scheduled deletion of Volumes",
+            count
+        )
+
     policy_rules = (("volume", "volume:delete"),)
 
     def delete(self, request, obj_id):