change slightly so tui and gui frontends can share concept of custom buttons, related to bug #66353

2 files changed, 7 insertions, 3 deletions

diff --git a/gui.py b/gui.py
index dcfac74b6..7f2511238 100755
--- a/gui.py
+++ b/gui.py
@@ -293,7 +293,11 @@ class MessageWindow:
 	if docustom:
 	    rid=0
 	    for button in custom_buttons:
-		widget = dialog.add_button(button, rid)
+		if button == _("Cancel"):
+		    tbutton = "gtk-cancel"
+		else:
+		    tbutton = button
+		widget = dialog.add_button(tbutton, rid)
 		rid = rid + 1
 
             defaultchoice = rid - 1
diff --git a/partIntfHelpers.py b/partIntfHelpers.py
index 6c880857a..79611b641 100644
--- a/partIntfHelpers.py
+++ b/partIntfHelpers.py
@@ -318,7 +318,7 @@ def queryNoFormatPreExisting(intf):
 #            "the partition ?")
 
 #    rc = intf.messageWindow(_("Format?"), txt, type = "yesno", default = "no")
-    rc = intf.messageWindow(_("Format?"), txt, type = "custom", custom_buttons=["gtk-cancel", _("Do Not Format")])
+    rc = intf.messageWindow(_("Format?"), txt, type = "custom", custom_buttons=[_("Cancel"), _("Do Not Format")])
     return rc
 
 def partitionSanityErrors(intf, errors):
@@ -405,7 +405,7 @@ def confirmDeleteRequest(intf, request):
         else:
             errmsg = _("You are about to delete the /dev/%s partition." % (request.device,))
 	rc = intf.messageWindow(_("Confirm Delete"), errmsg, type="custom",
-				    custom_buttons=["gtk-cancel", _("Delete")])
+				    custom_buttons=[_("Cancel"), _("Delete")])
     else:
         errmsg = _("Are you sure you want to delete this partition?")
 	rc = intf.messageWindow(_("Confirm Delete"), errmsg, type="yesno")