Skip to content

Commit

Permalink
LGA-2454 Welsh Language emails
Browse files Browse the repository at this point in the history 
Added new templates for Welsh language, picks up locale from cookies but does not notice welsh or other language on the contact us page
  • Loading branch information
@jogilder
jogilder committed Jun 15, 2023
1 parent a181daa commit 3e201d8
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 29 deletions.
11 changes: 6 additions & 5 deletions cla_public/apps/contact/tests/test_mail.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
from cla_public.apps.contact.views import create_and_send_confirmation_email, set_callback_time_string
from cla_public.apps.contact.forms import ContactForm
from cla_public.config.common import GOVUK_NOTIFY_TEMPLATES
from cla_public.libs.utils import get_locale


def submit(**kwargs):
Expand Down Expand Up @@ -81,7 +82,7 @@ def test_confirmation_email_callback(self):
self.assert_email_arguments(
govuk_notify,
personalisation=personalisation_data,
template_id=GOVUK_NOTIFY_TEMPLATES["PUBLIC_CALLBACK_WITH_NUMBER"],
template_id=GOVUK_NOTIFY_TEMPLATES["PUBLIC_CALLBACK_WITH_NUMBER"][get_locale()[:2]],
)

def test_confirmation_email_no_callback(self):
Expand All @@ -99,7 +100,7 @@ def test_confirmation_email_no_callback(self):
self.assert_email_arguments(
govuk_notify,
personalisation=personalisation_data,
template_id=GOVUK_NOTIFY_TEMPLATES["PUBLIC_CALLBACK_NOT_REQUESTED"],
template_id=GOVUK_NOTIFY_TEMPLATES["PUBLIC_CALLBACK_NOT_REQUESTED"][get_locale()[:2]],
)

def test_confirmation_email_thirdparty(self):
Expand All @@ -118,7 +119,7 @@ def test_confirmation_email_thirdparty(self):
self.assert_email_arguments(
govuk_notify,
personalisation=personalisation_data,
template_id=GOVUK_NOTIFY_TEMPLATES["PUBLIC_CALLBACK_THIRD_PARTY"],
template_id=GOVUK_NOTIFY_TEMPLATES["PUBLIC_CALLBACK_THIRD_PARTY"][get_locale()[:2]],
)

def test_confirmation_no_callback(self):
Expand All @@ -132,7 +133,7 @@ def test_confirmation_no_callback(self):
self.assert_email_arguments(
govuk_notify,
personalisation=personalisation_data,
template_id=GOVUK_NOTIFY_TEMPLATES["PUBLIC_CONFIRMATION_NO_CALLBACK"],
template_id=GOVUK_NOTIFY_TEMPLATES["PUBLIC_CONFIRMATION_NO_CALLBACK"][get_locale()[:2]],
)

def test_confirmation_callback(self):
Expand All @@ -147,7 +148,7 @@ def test_confirmation_callback(self):
self.assert_email_arguments(
govuk_notify,
personalisation=personalisation_data,
template_id=GOVUK_NOTIFY_TEMPLATES["PUBLIC_CONFIRMATION_EMAIL_CALLBACK_REQUESTED"],
template_id=GOVUK_NOTIFY_TEMPLATES["PUBLIC_CONFIRMATION_EMAIL_CALLBACK_REQUESTED"][get_locale()[:2]],
)


Expand Down
12 changes: 6 additions & 6 deletions cla_public/apps/contact/views.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
from cla_public.libs.views import AjaxOrNormalMixin, AllowSessionOverride, SessionBackedFormView, HasFormMixin
from cla_public.apps.base.govuk_notify.api import GovUkNotify
from cla_public.config.common import GOVUK_NOTIFY_TEMPLATES

from cla_public.libs.utils import get_locale

log = logging.getLogger(__name__)

Expand Down Expand Up @@ -66,10 +66,10 @@ def generate_confirmation_email_data(data):
if "full_name" not in data:
if session.stored["callback_requested"] is True:
personalisation = {"case_reference": data["case_ref"], "date_time": set_callback_time_string(data)}
template_id = GOVUK_NOTIFY_TEMPLATES["PUBLIC_CONFIRMATION_EMAIL_CALLBACK_REQUESTED"]
template_id = GOVUK_NOTIFY_TEMPLATES["PUBLIC_CONFIRMATION_EMAIL_CALLBACK_REQUESTED"][get_locale()[:2]]
else:
personalisation = {"case_reference": data["case_ref"]}
template_id = GOVUK_NOTIFY_TEMPLATES["PUBLIC_CONFIRMATION_NO_CALLBACK"]
template_id = GOVUK_NOTIFY_TEMPLATES["PUBLIC_CONFIRMATION_NO_CALLBACK"][get_locale()[:2]]

return email_address, template_id, personalisation

Expand All @@ -82,16 +82,16 @@ def generate_confirmation_email_data(data):
}

if session.stored["callback_requested"] is False:
template_id = GOVUK_NOTIFY_TEMPLATES["PUBLIC_CALLBACK_NOT_REQUESTED"]
template_id = GOVUK_NOTIFY_TEMPLATES["PUBLIC_CALLBACK_NOT_REQUESTED"][get_locale()[:2]]

return email_address, template_id, personalisation

# Decides between a personal callback or a third party callback
if data["callback"]["contact_number"]:
template_id = GOVUK_NOTIFY_TEMPLATES["PUBLIC_CALLBACK_WITH_NUMBER"]
template_id = GOVUK_NOTIFY_TEMPLATES["PUBLIC_CALLBACK_WITH_NUMBER"][get_locale()[:2]]
personalisation.update(contact_number=data["callback"]["contact_number"])
elif data["thirdparty"]["contact_number"]:
template_id = GOVUK_NOTIFY_TEMPLATES["PUBLIC_CALLBACK_THIRD_PARTY"]
template_id = GOVUK_NOTIFY_TEMPLATES["PUBLIC_CALLBACK_THIRD_PARTY"][get_locale()[:2]]
personalisation.update(contact_number=data["thirdparty"]["contact_number"])

return email_address, template_id, personalisation
Expand Down
68 changes: 50 additions & 18 deletions cla_public/config/common.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,24 +112,56 @@ def config_path(x):
GOVUK_NOTIFY_API_KEY = os.environ.get("GOVUK_NOTIFY_API_KEY")

GOVUK_NOTIFY_TEMPLATES = {
"PUBLIC_CALLBACK_NOT_REQUESTED": os.environ.get(
"GOVUK_NOTIFY_TEMPLATE_PUBLIC_CALLBACK_NOT_REQUESTED", "382cc41c-b81d-4197-8819-2ad76522d03d"
),
"PUBLIC_CALLBACK_WITH_NUMBER": os.environ.get(
"GOVUK_NOTIFY_TEMPLATE_PUBLIC_CALLBACK_WITH_NUMBER", "b4cfa1b6-f1e9-44c1-9b02-f07ba896b669"
),
"PUBLIC_CALLBACK_WITH_NO_NUMBER": os.environ.get(
"GOVUK_NOTIFY_TEMPLATE_PUBLIC_CALLBACK_WITH_NO_NUMBER", "3e2926c5-1bdf-4eb3-b212-7f206f1d764d"
),
"PUBLIC_CALLBACK_THIRD_PARTY": os.environ.get(
"GOVUK_NOTIFY_TEMPLATE_PUBLIC_CALLBACK_THIRD_PARTY", "7ffc6de3-07bd-4232-b416-cf18d0abfec6"
),
"PUBLIC_CONFIRMATION_NO_CALLBACK": os.environ.get(
"GOVUK_NOTIFY_TEMPLATE_PUBLIC_CONFIRMATION_NO_CALLBACK", "1a56ee47-a200-43f9-bab2-e0852da0714b"
),
"PUBLIC_CONFIRMATION_EMAIL_CALLBACK_REQUESTED": os.environ.get(
"GOVUK_NOTIFY_TEMPLATE_PUBLIC_CONFIRMATION_EMAIL_CALLBACK_REQUESTED", "020ba10c-ac98-4b7c-a49f-1f129462506b"
),
"PUBLIC_CALLBACK_NOT_REQUESTED": {
"en": os.environ.get(
"GOVUK_NOTIFY_TEMPLATE_PUBLIC_CALLBACK_NOT_REQUESTED", "382cc41c-b81d-4197-8819-2ad76522d03d"
),
"cy": os.environ.get(
"GOVUK_NOTIFY_TEMPLATE_PUBLIC_CALLBACK_NOT_REQUESTED_WELSH", "5ae3e895-95f5-44bb-b7d0-0224273c908d"
),
},
"PUBLIC_CALLBACK_WITH_NUMBER": {
"en": os.environ.get(
"GOVUK_NOTIFY_TEMPLATE_PUBLIC_CALLBACK_WITH_NUMBER", "b4cfa1b6-f1e9-44c1-9b02-f07ba896b669"
),
"cy": os.environ.get(
"GOVUK_NOTIFY_TEMPLATE_PUBLIC_CALLBACK_WITH_NUMBER_WELSH", "7428dd15-8583-4e2d-9d0a-c8a4e0b740b4"
),
},
"PUBLIC_CALLBACK_WITH_NO_NUMBER": {
"en": os.environ.get(
"GOVUK_NOTIFY_TEMPLATE_PUBLIC_CALLBACK_WITH_NO_NUMBER", "3e2926c5-1bdf-4eb3-b212-7f206f1d764d"
),
"cy": os.environ.get(
"GOVUK_NOTIFY_TEMPLATE_PUBLIC_CALLBACK_WITH_NO_NUMBER_WELSH", "71f9343e-09c0-49d8-aee6-86ceec7fcda8"
),
},
"PUBLIC_CALLBACK_THIRD_PARTY": {
"en": os.environ.get(
"GOVUK_NOTIFY_TEMPLATE_PUBLIC_CALLBACK_THIRD_PARTY", "7ffc6de3-07bd-4232-b416-cf18d0abfec6"
),
"cy": os.environ.get(
"GOVUK_NOTIFY_TEMPLATE_PUBLIC_CALLBACK_THIRD_PARTY_WELSH", "23105d37-d59a-47a5-afdb-17a442cab3d8"
),
},
"PUBLIC_CONFIRMATION_NO_CALLBACK": {
"en": os.environ.get(
"GOVUK_NOTIFY_TEMPLATE_PUBLIC_CONFIRMATION_NO_CALLBACK", "1a56ee47-a200-43f9-bab2-e0852da0714b"
),
"cy": os.environ.get(
"GOVUK_NOTIFY_TEMPLATE_PUBLIC_CONFIRMATION_NO_CALLBACK_WELSH", "25237d11-a531-4aca-a482-d232c2cb47d4"
),
},
"PUBLIC_CONFIRMATION_EMAIL_CALLBACK_REQUESTED": {
"en": os.environ.get(
"GOVUK_NOTIFY_TEMPLATE_PUBLIC_CONFIRMATION_EMAIL_CALLBACK_REQUESTED",
"020ba10c-ac98-4b7c-a49f-1f129462506b",
),
"cy": os.environ.get(
"GOVUK_NOTIFY_TEMPLATE_PUBLIC_CONFIRMATION_EMAIL_CALLBACK_REQUESTED_WELSH",
"8b169ee3-4295-4a6b-beb3-ca67c8123e6b",
),
},
}

GOOGLE_MAPS_API_KEY = os.environ.get("GOOGLE_MAPS_API_KEY", "")
Expand Down

0 comments on commit 3e201d8

Please sign in to comment.