Merge pull request #2501 from alphagov/update_confirm_delete_messages

Make deletion confirmation banner messages consistent across our app

app/main/views/api_keys.py

@@ -130,9 +130,12 @@ def create_api_key(service_id):
 def revoke_api_key(service_id, key_id):
     key_name = current_service.get_api_key(key_id)['name']
     if request.method == 'GET':
+        flash([
+            "Are you sure you want to revoke ‘{}’?".format(key_name),
+            "You will not be able to use this API key to connect to GOV.UK Notify."
+        ], 'revoke this API key')
         return render_template(
             'views/api/keys.html',
-            revoke_key=key_name,
         )
     elif request.method == 'POST':
         api_key_api_client.revoke_api_key(service_id=service_id, key_id=key_id)

app/main/views/service_settings.py

@@ -419,11 +419,12 @@ def service_edit_email_reply_to(service_id, reply_to_email_id):
             is_default=True if reply_to_email_address['is_default'] else form.is_default.data
         )
         return redirect(url_for('.service_email_reply_to', service_id=service_id))
+    if (request.endpoint == "main.service_confirm_delete_email_reply_to"):
+        flash("Are you sure you want to delete this email reply-to address?", 'delete')
     return render_template(
         'views/service-settings/email-reply-to/edit.html',
         form=form,
         reply_to_email_address_id=reply_to_email_id,
-        confirm_delete=(request.endpoint == "main.service_confirm_delete_email_reply_to"),
     )
 
 
@@ -687,13 +688,14 @@ def service_edit_sms_sender(service_id, sms_sender_id):
         return redirect(url_for('.service_sms_senders', service_id=service_id))
 
     form.is_default.data = sms_sender['is_default']
+    if (request.endpoint == "main.service_confirm_delete_sms_sender"):
+        flash("Are you sure you want to delete this text message sender?", 'delete')
     return render_template(
         'views/service-settings/sms-sender/edit.html',
         form=form,
         sms_sender=sms_sender,
         inbound_number=is_inbound_number,
-        sms_sender_id=sms_sender_id,
-        confirm_delete=(request.endpoint == "main.service_confirm_delete_sms_sender")
+        sms_sender_id=sms_sender_id
     )
 
 

app/main/views/templates.py

@@ -441,7 +441,7 @@ def delete_template_folder(service_id, template_folder_id):
             else:
                 abort(500, e)
 
-    flash("Are you sure you want to delete the '{}' folder?".format(template_folder_name), 'delete')
+    flash("Are you sure you want to delete the ‘{}’ folder?".format(template_folder_name), 'delete')
     return render_template(
         'views/templates/manage-template-folder.html',
         form=form,
@@ -615,7 +615,7 @@ def delete_service_template(service_id, template_id):
         last_used_notification = template_statistics_client.get_template_statistics_for_template(
             service_id, template['id']
         )
-        message = 'It was last used {} ago'.format(
+        message = 'This template was last used {} ago.'.format(
             'more than seven days' if not last_used_notification else get_human_readable_delta(
                 parse(last_used_notification['created_at']).replace(tzinfo=None),
                 datetime.utcnow()
@@ -628,12 +628,9 @@ def delete_service_template(service_id, template_id):
         else:
             raise e
 
+    flash(["Are you sure you want to delete ‘{}’?".format(template['name']), message], 'delete')
     return render_template(
         'views/templates/template.html',
-        template_delete_confirmation_message=(
-            'Are you sure you want to delete {}?'.format(template['name']),
-            message,
-        ),
         template=get_template(
             template,
             current_service,