darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-07-12 17:34:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3578 from alphagov/update-sent-status-label

Browse Source 
Update sent status label
This commit is contained in:
karlchillmaid
2020-09-17 13:16:41 +01:00
committed by GitHub
parent dd8ce7d5bd daaa3d69a3
commit 60a63c69ee
4 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/__init__.py
View File

@@ -435,7 +435,7 @@ def format_notification_status(status, template_type):
'sending': 'Sending',
'created': 'Sending',
'pending': 'Sending',
'sent': 'Sent internationally'
'sent': 'Sent to an international number'
},
'letter': {
'failed': '',
@@ -479,7 +479,10 @@ def format_notification_status_as_field_status(status, notification_type):
'virus-scan-failed': 'error',
'returned-letter': None,
'cancelled': 'error',
}
},
'sms': {
'sent': 'sent-international'
},
}.get(
notification_type,
{

10
app/assets/stylesheets/components/table.scss
View File

@@ -225,6 +225,16 @@
}
&-sent-international {
.status-hint {
display: block;
font-weight: normal;
margin-top: 5px;
}
}
&-yes,
&-no {
display: block;

2
app/templates/components/table.html
View File

@@ -147,7 +147,7 @@
{% macro notification_status_field(notification) %}
{% set displayed_on_single_line = notification.status in ['created', 'pending', 'pending-virus-check', 'sending', 'sent', 'delivered', 'returned-letter', 'accepted', 'received'] %}
{% set displayed_on_single_line = notification.status in ['created', 'pending', 'pending-virus-check', 'sending', 'delivered', 'returned-letter', 'accepted', 'received'] %}
{% if not notification %}
{% call field(align='right') %}{% endcall %}

2
app/templates/views/message-status.html
View File

@@ -53,7 +53,7 @@
) %}
{% for message_length, charge in [
('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.'),
('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 <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for(".support") }}">contact us</a>. 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, has no signal, or their text message inbox is full. You can try to send the message again. You’ll still be charged for text messages to phones that are not accepting messages.'),