diff --git a/app/config.py b/app/config.py index 920bbf13c..0d2d7ed1f 100644 --- a/app/config.py +++ b/app/config.py @@ -82,8 +82,8 @@ class Config(object): FF_RTL = env.bool("FF_RTL", True) FF_ANNUAL_LIMIT = env.bool("FF_ANNUAL_LIMIT", True) - FREE_YEARLY_EMAIL_LIMIT = env.int("FREE_YEARLY_EMAIL_LIMIT", 10_000_000) - FREE_YEARLY_SMS_LIMIT = env.int("FREE_YEARLY_SMS_LIMIT", 25_000) + FREE_YEARLY_EMAIL_LIMIT = env.int("FREE_YEARLY_EMAIL_LIMIT", 20_000_000) + FREE_YEARLY_SMS_LIMIT = env.int("FREE_YEARLY_SMS_LIMIT", 100_000) GC_ARTICLES_API = os.environ.get("GC_ARTICLES_API", "articles.alpha.canada.ca/notification-gc-notify") GC_ARTICLES_API_AUTH_PASSWORD = os.environ.get("GC_ARTICLES_API_AUTH_PASSWORD") GC_ARTICLES_API_AUTH_USERNAME = os.environ.get("GC_ARTICLES_API_AUTH_USERNAME") diff --git a/app/templates/components/terms.html b/app/templates/components/terms.html index 8d3dcf119..e161a19c8 100644 --- a/app/templates/components/terms.html +++ b/app/templates/components/terms.html @@ -53,7 +53,7 @@

{{ _(headings[1].title) }}

{{ _('Daily limit per service:') }}

-

{{ _('10,000 emails
1000 text messages') }}

+

{{ _('10,000 emails
1,000 text messages') }}

@@ -66,7 +66,7 @@

{{ _(headings[1].title) }}

-

{{ _('10 million emails
25,000 text messages') }}

+

{{ _('20 million emails
100,000 text messages') }}

diff --git a/app/translations/csv/fr.csv b/app/translations/csv/fr.csv index 464106099..23ba5ac52 100644 --- a/app/translations/csv/fr.csv +++ b/app/translations/csv/fr.csv @@ -1944,9 +1944,9 @@ "We apply limits to maintain our ","Nous appliquons des limites afin de maintenir nos " "To discuss these limits, ","Si vous souhaitez en discuter avec nous, n’hésitez pas à " "Daily limit per service:","Limite par jour et par service :" -"10,000 emails
1000 text messages","10 000 courriels
1 000 messages texte" +"10,000 emails
1,000 text messages","10 000 courriels
1 000 messages texte" "Annual limit per service (April 1 to March 31):","Limite par année et par service (du 1er avril au 31 mars) :" -"10 million emails
25,000 text messages","10 millions de courriels
25 000 messages texte" +"20 million emails
100,000 text messages","20 millions de courriels
100 000 messages texte" "Texts are:","Les messages texte :" "Unencrypted, and have other security issues. Bad actors may be able to impersonate your service.","ne sont pas chiffrés et présentent d’autres problèmes en matière de sécurité (disponible en anglais seulement). Des personnes mal intentionnées pourraient être en mesure d’usurper l’identité de votre service;" "At higher risk than email for delay, delivery failure, or lack of information about delivery status.","présentent un risque plus élevé de retard, d’échec de livraison ou de manque d’information sur l’état de livraison que les courriels;" diff --git a/tests/__init__.py b/tests/__init__.py index 7e6bef33e..494d6797d 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -176,8 +176,8 @@ def service_json( message_limit=1000, sms_daily_limit=1000, rate_limit=100, - email_annual_limit=10000000, - sms_annual_limit=25000, + email_annual_limit=20000000, + sms_annual_limit=100000, active=True, restricted=True, email_from="test.service", diff --git a/tests/app/main/views/test_service_settings.py b/tests/app/main/views/test_service_settings.py index 10a1af772..2ce8210a5 100644 --- a/tests/app/main/views/test_service_settings.py +++ b/tests/app/main/views/test_service_settings.py @@ -71,13 +71,13 @@ def mock_get_service_settings_page_common( "Email branding English Government of Canada signature Change", "Send files by email Off (API-only) Change", "Daily maximum 1,000 emails", - "Annual maximum(April 1 to March 31) 10,000,000 emails", + "Annual maximum(April 1 to March 31) 20,000,000 emails", "Label Value Action", "Send text messages On Change", "Start text messages with service name On Change", "Send international text messages Off Change", "Daily maximum 1,000 text messages", - "Annual maximum(April 1 to March 31) 25,000 text messages", + "Annual maximum(April 1 to March 31) 100,000 text messages", ], ), ( @@ -95,21 +95,21 @@ def mock_get_service_settings_page_common( "Email branding English Government of Canada signature Change", "Send files by email Off (API-only) Change", "Daily maximum 1,000 emails", - "Annual maximum(April 1 to March 31) 10,000,000 emails", + "Annual maximum(April 1 to March 31) 20,000,000 emails", "Label Value Action", "Send text messages On Change", "Start text messages with service name On Change", "Send international text messages Off Change", "Daily maximum 1,000 text messages", - "Annual maximum(April 1 to March 31) 25,000 text messages", + "Annual maximum(April 1 to March 31) 100,000 text messages", "Label Value Action", "Live On Change", "Count in list of live services Yes Change", "Organisation Test Organisation Government of Canada Change", "Daily email limit 1,000 Change", "Daily text message limit 1,000 Change", - "Annual email limit 10,000,000 Change", - "Annual text message limit 25,000 Change", + "Annual email limit 20,000,000 Change", + "Annual text message limit 100,000 Change", "API rate limit per minute 100", "Text message senders GOVUK Manage", "Receive text messages Off Change", @@ -233,13 +233,13 @@ def test_organisation_name_links_to_org_dashboard( "Email branding Your branding (Organisation name) Change", "Send files by email Off (API-only) Change", "Daily maximum 1,000 emails", - "Annual maximum(April 1 to March 31) 10,000,000 emails", + "Annual maximum(April 1 to March 31) 20,000,000 emails", "Label Value Action", "Send text messages On Change", "Start text messages with service name On Change", "Send international text messages On Change", "Daily maximum 1,000 text messages", - "Annual maximum(April 1 to March 31) 25,000 text messages", + "Annual maximum(April 1 to March 31) 100,000 text messages", ], ), ( @@ -255,13 +255,13 @@ def test_organisation_name_links_to_org_dashboard( "Email branding Your branding (Organisation name) Change", "Send files by email Off (API-only) Change", "Daily maximum 1,000 emails", - "Annual maximum(April 1 to March 31) 10,000,000 emails", + "Annual maximum(April 1 to March 31) 20,000,000 emails", "Label Value Action", "Send text messages On Change", "Start text messages with service name On Change", "Send international text messages Off Change", "Daily maximum 1,000 text messages", - "Annual maximum(April 1 to March 31) 25,000 text messages", + "Annual maximum(April 1 to March 31) 100,000 text messages", ], ), ], @@ -3235,7 +3235,7 @@ def test_unknown_channel_404s( ), ( "sms", - "You can send up to 25,000 text messages per fiscal year.", + "You can send up to 100,000 text messages per fiscal year.", "Send text messages", [], "False", @@ -3244,7 +3244,7 @@ def test_unknown_channel_404s( ), ( "email", - "You can send up to 10 million emails per fiscal year for free.", + "You can send up to 20 million emails per fiscal year for free.", "Send emails", [], "False", @@ -3253,7 +3253,7 @@ def test_unknown_channel_404s( ), ( "email", - "You can send up to 10 million emails per fiscal year for free.", + "You can send up to 20 million emails per fiscal year for free.", "Send emails", ["email", "sms", "letter"], "True", diff --git a/tests/conftest.py b/tests/conftest.py index fedd0f170..a0c964cb9 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -3636,12 +3636,12 @@ def mock_update_message_limit(mocker): @pytest.fixture(scope="function") def mock_update_email_annual_limit(mocker): - return mocker.patch("app.service_api_client.update_email_annual_limit", return_value=10000000) + return mocker.patch("app.service_api_client.update_email_annual_limit", return_value=20000000) @pytest.fixture(scope="function") def mock_update_sms_annual_limit(mocker): - return mocker.patch("app.service_api_client.update_sms_annual_limit", return_value=25000) + return mocker.patch("app.service_api_client.update_sms_annual_limit", return_value=100000) @pytest.fixture(scope="function")