diff --git a/app/templates/views/service-settings.html b/app/templates/views/service-settings.html index 99f5078be..1c7f9443b 100644 --- a/app/templates/views/service-settings.html +++ b/app/templates/views/service-settings.html @@ -434,9 +434,9 @@ {% if not current_service.broadcast_channel %} Off {% else %} - {% if current_service.live and current_service.broadcast_channel == "severe" %}Live - Public channel{% endif %} - {% if current_service.live and current_service.broadcast_channel == "test" %}Test channel {% if current_service.allowed_broadcast_provider %}({{ current_service.allowed_broadcast_provider|format_mobile_network }} network){% else %} (All networks){% endif %}{%endif%} - {% if not current_service.live%}Training mode {% endif%} + {% if current_service.live and current_service.broadcast_channel == "severe" %}Live{% endif %} + {% if current_service.live and current_service.broadcast_channel == "test" %}Test {% if current_service.allowed_broadcast_provider %}({{ current_service.allowed_broadcast_provider|format_mobile_network }}){% else %}(All networks){% endif %}{%endif%} + {% if not current_service.live%}Training {% endif%} {% endif %} {% endcall %} {{ edit_field( diff --git a/tests/app/main/views/test_service_settings.py b/tests/app/main/views/test_service_settings.py index 8fd0d79ce..6b53a8cc2 100644 --- a/tests/app/main/views/test_service_settings.py +++ b/tests/app/main/views/test_service_settings.py @@ -186,7 +186,7 @@ def test_platform_admin_sees_only_relevant_settings_for_broadcast_service( 'Label Value Action', 'Notes None Change the notes for the service', 'Email authentication Off Change your settings for Email authentication', - 'Send cell broadcasts Training mode Change your settings for Send cell broadcasts', + 'Send cell broadcasts Training Change your settings for Send cell broadcasts', ] assert len(rows) == len(expected_rows) @@ -200,11 +200,11 @@ def test_platform_admin_sees_only_relevant_settings_for_broadcast_service( [ (False, "training", None, None, "Off"), (False, "live", None, None, "Off"), - (True, "training", "test", None, "Training mode"), - (True, "live", "test", "ee", "Test channel (EE network)"), - (True, "live", "test", "three", "Test channel (Three network)"), - (True, "live", "test", None, "Test channel (All networks)"), - (True, "live", "severe", None, "Live - Public channel"), + (True, "training", "test", None, "Training"), + (True, "live", "test", "ee", "Test (EE)"), + (True, "live", "test", "three", "Test (Three)"), + (True, "live", "test", None, "Test (All networks)"), + (True, "live", "severe", None, "Live"), ] ) def test_platform_admin_sees_correct_description_of_broadcast_service_setting(