From b2983bd56634cc4c8e2094c3a74143c6a16f7896 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Fri, 5 Jun 2020 17:33:31 +0100 Subject: [PATCH 1/6] Update permanent failure error message description --- app/templates/views/message-status.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/message-status.html b/app/templates/views/message-status.html index 613bcc2b1..5cc3265a5 100644 --- a/app/templates/views/message-status.html +++ b/app/templates/views/message-status.html @@ -55,7 +55,7 @@ ('Sending', 'Notify has sent the message to the provider. The provider will try to deliver the message to the recipient for up to 72 hours. Notify is waiting for delivery information.'), ('Sent internationally', 'The message was sent to an international number. The mobile networks in some countries do not provide any more delivery information.'), ('Delivered', 'The message was successfully delivered. Notify will not tell you if a user has opened or read a message.'), - ('Phone number does not exist', 'The provider could not deliver the message because the phone number was wrong. You should remove these phone numbers from your database. You’ll still be charged for text messages to numbers that do not exist.'), + ('Not delivered', 'The provider could not deliver the message. This can happen if the phone number was wrong or if the network operator rejects the message. You should check that these phone numbers are correct. If not, you should remove them from your database. You’ll still be charged for text messages that cannot be delivered.'), ('Phone not accepting messages right now', 'The provider could not deliver the message. This can happen when the recipient’s phone is off. You can try to send the message again. You’ll still be charged for text messages to phones that are not accepting messages.'), ('Technical failure', 'Your message was not sent because there was a problem between Notify and the provider. You’ll have to try sending your messages again. You will not be charged for text messages that are affected by a technical failure.'), ] %} From 221a32441bda099c484dcb4eaf1818447a54cdfc Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Fri, 5 Jun 2020 17:34:54 +0100 Subject: [PATCH 2/6] Update permanent failure error name --- app/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/__init__.py b/app/__init__.py index a3b5f5619..eb2775acd 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -427,7 +427,7 @@ def format_notification_status(status, template_type): 'failed': 'Failed', 'technical-failure': 'Technical failure', 'temporary-failure': 'Phone not accepting messages right now', - 'permanent-failure': 'Phone number does not exist', + 'permanent-failure': 'Not delivered', 'delivered': 'Delivered', 'sending': 'Sending', 'created': 'Sending', From 1bf6eb06a517ba320c4b615b410e463d2c006e9f Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Fri, 5 Jun 2020 17:36:04 +0100 Subject: [PATCH 3/6] Update error message content --- tests/app/main/views/test_activity.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/app/main/views/test_activity.py b/tests/app/main/views/test_activity.py index 6b92c7bec..3671b0992 100644 --- a/tests/app/main/views/test_activity.py +++ b/tests/app/main/views/test_activity.py @@ -715,7 +715,7 @@ def test_big_numbers_dont_show_for_letters( ('sms', 'created', 'Sending since 27 September at 5:30pm', True), ('sms', 'sending', 'Sending since 27 September at 5:30pm', True), ('sms', 'temporary-failure', 'Phone not accepting messages right now 27 September at 5:31pm', False), - ('sms', 'permanent-failure', 'Phone number does not exist 27 September at 5:31pm', False), + ('sms', 'permanent-failure', 'Not delivered 27 September at 5:31pm', False), ('sms', 'delivered', 'Delivered 27 September at 5:31pm', True), ('letter', 'created', '27 September at 5:30pm', True), ('letter', 'pending-virus-check', '27 September at 5:30pm', True), From 0df3d2d323eb0acd0cedaae86225a380df1f5c35 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Fri, 5 Jun 2020 17:37:16 +0100 Subject: [PATCH 4/6] Update error message content --- tests/app/main/views/test_notifications.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/app/main/views/test_notifications.py b/tests/app/main/views/test_notifications.py index 625048c9c..b92ecfa69 100644 --- a/tests/app/main/views/test_notifications.py +++ b/tests/app/main/views/test_notifications.py @@ -23,13 +23,13 @@ from tests.conftest import ( (None, 'delivered', 'Delivered'), (None, 'failed', 'Failed'), (None, 'temporary-failure', 'Phone not accepting messages right now'), - (None, 'permanent-failure', 'Phone number does not exist'), + (None, 'permanent-failure', 'Not delivered'), (None, 'technical-failure', 'Technical failure'), ('team', 'delivered', 'Delivered'), ('live', 'delivered', 'Delivered'), ('test', 'sending', 'Sending (test)'), ('test', 'delivered', 'Delivered (test)'), - ('test', 'permanent-failure', 'Phone number does not exist (test)'), + ('test', 'permanent-failure', 'Not delivered (test)'), ]) @pytest.mark.parametrize('user', [ create_active_user_with_permissions(), From b464d5b898a82bf3d5196856c983d2ac00a5f1a5 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Wed, 10 Jun 2020 13:59:59 +0100 Subject: [PATCH 5/6] Add contact us information --- app/templates/views/message-status.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/message-status.html b/app/templates/views/message-status.html index 5cc3265a5..e8bc53719 100644 --- a/app/templates/views/message-status.html +++ b/app/templates/views/message-status.html @@ -55,7 +55,7 @@ ('Sending', 'Notify has sent the message to the provider. The provider will try to deliver the message to the recipient for up to 72 hours. Notify is waiting for delivery information.'), ('Sent internationally', 'The message was sent to an international number. The mobile networks in some countries do not provide any more delivery information.'), ('Delivered', 'The message was successfully delivered. Notify will not tell you if a user has opened or read a message.'), - ('Not delivered', 'The provider could not deliver the message. This can happen if the phone number was wrong or if the network operator rejects the message. You should check that these phone numbers are correct. If not, you should remove them from your database. You’ll still be charged for text messages that cannot be delivered.'), + ('Not delivered', 'The provider could not deliver the message. This can happen if the phone number was wrong or if the network operator rejects the message. If you’re sure that these phone numbers are correct, you should contact us. If not, you should remove them from your database. You’ll still be charged for text messages that cannot be delivered.'), ('Phone not accepting messages right now', 'The provider could not deliver the message. This can happen when the recipient’s phone is off. You can try to send the message again. You’ll still be charged for text messages to phones that are not accepting messages.'), ('Technical failure', 'Your message was not sent because there was a problem between Notify and the provider. You’ll have to try sending your messages again. You will not be charged for text messages that are affected by a technical failure.'), ] %} From 1f3d74195f05ff560bc8b8fa2f33d31e2006ad66 Mon Sep 17 00:00:00 2001 From: Rebecca Law Date: Wed, 10 Jun 2020 16:01:01 +0100 Subject: [PATCH 6/6] Updated the message so the TextField didn't escape the HTML --- app/templates/views/message-status.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/message-status.html b/app/templates/views/message-status.html index e8bc53719..3ba2a01ab 100644 --- a/app/templates/views/message-status.html +++ b/app/templates/views/message-status.html @@ -55,7 +55,7 @@ ('Sending', 'Notify has sent the message to the provider. The provider will try to deliver the message to the recipient for up to 72 hours. Notify is waiting for delivery information.'), ('Sent internationally', 'The message was sent to an international number. The mobile networks in some countries do not provide any more delivery information.'), ('Delivered', 'The message was successfully delivered. Notify will not tell you if a user has opened or read a message.'), - ('Not delivered', 'The provider could not deliver the message. This can happen if the phone number was wrong or if the network operator rejects the message. If you’re sure that these phone numbers are correct, you should contact us. If not, you should remove them from your database. You’ll still be charged for text messages that cannot be delivered.'), + ('Not delivered', 'The provider could not deliver the message. This can happen if the phone number was wrong or if the network operator rejects the message. If you’re sure that these phone numbers are correct, you should contact us. If not, you should remove them from your database. You’ll still be charged for text messages that cannot be delivered.'|safe), ('Phone not accepting messages right now', 'The provider could not deliver the message. This can happen when the recipient’s phone is off. You can try to send the message again. You’ll still be charged for text messages to phones that are not accepting messages.'), ('Technical failure', 'Your message was not sent because there was a problem between Notify and the provider. You’ll have to try sending your messages again. You will not be charged for text messages that are affected by a technical failure.'), ] %}