From adf8b1efa4945c32267c540a9a2ea88c2756c695 Mon Sep 17 00:00:00 2001
From: Akihiro Motoki <motoki@da.jp.nec.com>
Date: Tue, 6 Oct 2015 20:24:22 +0900
Subject: [PATCH] Replace "Terminate Instance" with "Delete Instance"

"Delete" is being used almost everywhere in OpenStack Dashboard
except the instance panel. Using "Delete" looks more consistent.
In addition, "Delete" tells non-native English speakers that
deleted instances will be no longer usable again compared to
"Terminate".

DocImpact
Closes-Bug: #1502773
Change-Id: Idccaf3c45566f20f11d02ada64c1d3934a6f3002
---
 .../trove/content/database_clusters/tables.py  | 18 +++++++++---------
 .../contrib/trove/content/databases/tables.py  | 18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/openstack_dashboard/contrib/trove/content/database_clusters/tables.py b/openstack_dashboard/contrib/trove/content/database_clusters/tables.py
index 4e9f162..e52008b 100644
--- a/openstack_dashboard/contrib/trove/content/database_clusters/tables.py
+++ b/openstack_dashboard/contrib/trove/content/database_clusters/tables.py
@@ -29,25 +29,25 @@ from openstack_dashboard.contrib.trove.content.databases import db_capability
 ACTIVE_STATES = ("ACTIVE",)
 
 
-class TerminateCluster(tables.BatchAction):
-    name = "terminate"
+class DeleteCluster(tables.BatchAction):
+    name = "delete"
     icon = "remove"
     classes = ('btn-danger',)
-    help_text = _("Terminated cluster is not recoverable.")
+    help_text = _("Deleted cluster is not recoverable.")
 
     @staticmethod
     def action_present(count):
         return ungettext_lazy(
-            u"Terminate Cluster",
-            u"Terminate Clusters",
+            u"Delete Cluster",
+            u"Delete Clusters",
             count
         )
 
     @staticmethod
     def action_past(count):
         return ungettext_lazy(
-            u"Scheduled termination of Cluster",
-            u"Scheduled termination of Clusters",
+            u"Scheduled deletion of Cluster",
+            u"Scheduled deletion of Clusters",
             count
         )
 
@@ -159,8 +159,8 @@ class ClustersTable(tables.DataTable):
         verbose_name = _("Clusters")
         status_columns = ["task"]
         row_class = UpdateRow
-        table_actions = (LaunchLink, TerminateCluster)
-        row_actions = (AddShard, ResetPassword, TerminateCluster)
+        table_actions = (LaunchLink, DeleteCluster)
+        row_actions = (AddShard, ResetPassword, DeleteCluster)
 
 
 def get_instance_size(instance):
diff --git a/openstack_dashboard/contrib/trove/content/databases/tables.py b/openstack_dashboard/contrib/trove/content/databases/tables.py
index 81e305a..cb1d8d2 100644
--- a/openstack_dashboard/contrib/trove/content/databases/tables.py
+++ b/openstack_dashboard/contrib/trove/content/databases/tables.py
@@ -31,26 +31,26 @@ from openstack_dashboard.contrib.trove.content.database_backups \
 ACTIVE_STATES = ("ACTIVE",)
 
 
-class TerminateInstance(tables.BatchAction):
-    help_text = _("Terminated instances are not recoverable.")
+class DeleteInstance(tables.BatchAction):
+    help_text = _("Deleted instances are not recoverable.")
 
     @staticmethod
     def action_present(count):
         return ungettext_lazy(
-            u"Terminate Instance",
-            u"Terminate Instances",
+            u"Delete Instance",
+            u"Delete Instances",
             count
         )
 
     @staticmethod
     def action_past(count):
         return ungettext_lazy(
-            u"Scheduled termination of Instance",
-            u"Scheduled termination of Instances",
+            u"Scheduled deletion of Instance",
+            u"Scheduled deletion of Instances",
             count
         )
 
-    name = "terminate"
+    name = "delete"
     classes = ("btn-danger", )
     icon = "remove"
 
@@ -340,13 +340,13 @@ class InstancesTable(tables.DataTable):
         verbose_name = _("Instances")
         status_columns = ["status"]
         row_class = UpdateRow
-        table_actions = (LaunchLink, TerminateInstance)
+        table_actions = (LaunchLink, DeleteInstance)
         row_actions = (CreateBackup,
                        ResizeVolume,
                        ResizeInstance,
                        RestartInstance,
                        DetachReplica,
-                       TerminateInstance)
+                       DeleteInstance)
 
 
 class UsersTable(tables.DataTable):