From 402dba2a462eff15b42887b3022d378011a9f5d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Tue, 21 Aug 2018 16:53:45 +0200 Subject: [PATCH] backoffice: use "delete" as button verb in deletion dialogs (#25929) --- wcs/admin/bounces.py | 2 +- wcs/admin/categories.py | 2 +- wcs/admin/forms.py | 2 +- wcs/admin/roles.py | 2 +- wcs/admin/users.py | 2 +- wcs/admin/workflows.py | 10 +++++----- wcs/admin/wscalls.py | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/wcs/admin/bounces.py b/wcs/admin/bounces.py index 946daf18..abe3cf1e 100644 --- a/wcs/admin/bounces.py +++ b/wcs/admin/bounces.py @@ -120,7 +120,7 @@ class BouncePage(Directory): form = Form(enctype='multipart/form-data') form.widgets.append(HtmlWidget('

%s

' % _( 'You are about to irrevocably delete this bounce.'))) - form.add_submit('delete', _('Submit')) + form.add_submit('delete', _('Delete')) form.add_submit('cancel', _('Cancel')) if form.get_widget('cancel').parse(): return redirect('..') diff --git a/wcs/admin/categories.py b/wcs/admin/categories.py index 75268d56..d3447b33 100644 --- a/wcs/admin/categories.py +++ b/wcs/admin/categories.py @@ -125,7 +125,7 @@ class CategoryPage(Directory): form = Form(enctype='multipart/form-data') form.widgets.append(HtmlWidget('

%s

' % _( 'You are about to irrevocably delete this category.'))) - form.add_submit('delete', _('Submit')) + form.add_submit('delete', _('Delete')) form.add_submit('cancel', _('Cancel')) if form.get_widget('cancel').parse(): return redirect('.') diff --git a/wcs/admin/forms.py b/wcs/admin/forms.py index 27c1dafd..773f80ae 100644 --- a/wcs/admin/forms.py +++ b/wcs/admin/forms.py @@ -892,7 +892,7 @@ class FormDefPage(Directory): form = Form(enctype='multipart/form-data') form.widgets.append(HtmlWidget('

%s

' % _( 'You are about to irrevocably delete this form.'))) - form.add_submit('delete', _('Submit')) + form.add_submit('delete', _('Delete')) form.add_submit('cancel', _('Cancel')) if form.get_widget('cancel').parse(): return redirect('..') diff --git a/wcs/admin/roles.py b/wcs/admin/roles.py index 9270687d..5e274438 100644 --- a/wcs/admin/roles.py +++ b/wcs/admin/roles.py @@ -179,7 +179,7 @@ class RolePage(Directory): form = Form(enctype='multipart/form-data') form.widgets.append(HtmlWidget('

%s

' % _( "You are about to irrevocably delete this role."))) - form.add_submit('delete', _('Submit')) + form.add_submit('delete', _('Delete')) form.add_submit("cancel", _("Cancel")) if form.get_widget('cancel').parse(): return redirect('.') diff --git a/wcs/admin/users.py b/wcs/admin/users.py index c1143f52..fca3b395 100644 --- a/wcs/admin/users.py +++ b/wcs/admin/users.py @@ -268,7 +268,7 @@ class UserPage(Directory): form = Form(enctype='multipart/form-data') form.widgets.append(HtmlWidget('

%s

' % _( "You are about to irrevocably delete this user."))) - form.add_submit('delete', _('Submit')) + form.add_submit('delete', _('Delete')) form.add_submit("cancel", _("Cancel")) if form.get_widget('cancel').parse(): return redirect('.') diff --git a/wcs/admin/workflows.py b/wcs/admin/workflows.py index 4fe42791..82deb5a7 100644 --- a/wcs/admin/workflows.py +++ b/wcs/admin/workflows.py @@ -280,7 +280,7 @@ class WorkflowItemPage(Directory): def delete(self): form = Form(enctype='multipart/form-data') form.widgets.append(HtmlWidget('

%s

' % _('You are about to remove an item.'))) - form.add_submit('delete', _('Submit')) + form.add_submit('delete', _('Delete')) form.add_submit('cancel', _('Cancel')) if form.get_widget('cancel').parse(): return redirect('../../') @@ -341,7 +341,7 @@ class GlobalActionTriggerPage(Directory): def delete(self): form = Form(enctype='multipart/form-data') form.widgets.append(HtmlWidget('

%s

' % _('You are about to remove a trigger.'))) - form.add_submit('delete', _('Submit')) + form.add_submit('delete', _('Delete')) form.add_submit('cancel', _('Cancel')) if form.get_widget('cancel').parse(): return redirect('../../') @@ -553,7 +553,7 @@ class WorkflowStatusPage(Directory): form = Form(enctype="multipart/form-data") form.widgets.append(HtmlWidget('

%s

' % _( "You are about to remove a status."))) - form.add_submit('delete', _('Submit')) + form.add_submit('delete', _('Delete')) form.add_submit("cancel", _("Cancel")) if form.get_widget('cancel').parse(): return redirect('.') @@ -1176,7 +1176,7 @@ class GlobalActionPage(WorkflowStatusPage): form = Form(enctype='multipart/form-data') form.widgets.append(HtmlWidget('

%s

' % _( 'You are about to remove an action.'))) - form.add_submit('delete', _('Submit')) + form.add_submit('delete', _('Delete')) form.add_submit('cancel', _('Cancel')) if form.get_widget('cancel').parse(): return redirect('.') @@ -1730,7 +1730,7 @@ class WorkflowPage(Directory): else: form.widgets.append(HtmlWidget('

%s

' % _( "You are about to irrevocably delete this workflow."))) - form.add_submit('delete', _('Submit')) + form.add_submit('delete', _('Delete')) form.add_submit("cancel", _("Cancel")) if form.get_widget('cancel').parse(): return redirect('.') diff --git a/wcs/admin/wscalls.py b/wcs/admin/wscalls.py index 9de79729..d7d2a8ef 100644 --- a/wcs/admin/wscalls.py +++ b/wcs/admin/wscalls.py @@ -162,7 +162,7 @@ class NamedWsCallPage(Directory): form = Form(enctype='multipart/form-data') form.widgets.append(HtmlWidget('

%s

' % _( 'You are about to irrevocably delete this webservice call.'))) - form.add_submit('delete', _('Submit')) + form.add_submit('delete', _('Delete')) form.add_submit('cancel', _('Cancel')) if form.get_widget('cancel').parse(): return redirect('..') -- 2.18.0