From 1155fa2d55aec86b061868ed4f4a62b2852188be Mon Sep 17 00:00:00 2001 From: FrancescaOSH Date: Tue, 7 Jan 2025 16:55:14 +0100 Subject: [PATCH] [OSDEV-1524] align salutations and signatures in automated emails (#478) Updated salutations in automated emails to be consistent across all email templates. This ensures that customers have a consistent and professional experience of communication from OS Hub. --- doc/release/RELEASE-NOTES.md | 1 + src/django/api/templates/mail/api_limit_admin_body.html | 4 ++-- src/django/api/templates/mail/api_limit_admin_body.txt | 4 ++-- src/django/api/templates/mail/api_limit_body.html | 6 +++--- src/django/api/templates/mail/api_limit_body.txt | 8 ++++---- .../api/templates/mail/api_limit_warning_admin_body.html | 4 ++-- .../api/templates/mail/api_limit_warning_admin_body.txt | 4 ++-- src/django/api/templates/mail/api_limit_warning_body.html | 6 +++--- src/django/api/templates/mail/api_limit_warning_body.txt | 6 +++--- .../api/templates/mail/claim_facility_approval_body.html | 4 ++-- .../api/templates/mail/claim_facility_approval_body.txt | 4 ++-- .../api/templates/mail/claim_facility_denial_body.html | 4 ++-- .../api/templates/mail/claim_facility_denial_body.txt | 4 ++-- .../templates/mail/claim_facility_revocation_body.html | 4 ++-- .../api/templates/mail/claim_facility_revocation_body.txt | 4 ++-- .../api/templates/mail/claim_facility_submitted_body.html | 4 ++-- .../api/templates/mail/claim_facility_submitted_body.txt | 4 ++-- .../api/templates/mail/claims_team_signature_block.html | 2 +- .../api/templates/mail/claims_team_signature_block.txt | 2 +- .../api/templates/mail/data_team_signature_block.html | 2 +- .../api/templates/mail/data_team_signature_block.txt | 2 +- .../api/templates/mail/email_confirmation_message.html | 4 ++-- .../api/templates/mail/email_confirmation_message.txt | 4 ++-- ...lity_claim_profile_update_contributor_notice_body.html | 4 ++-- ...ility_claim_profile_update_contributor_notice_body.txt | 4 ++-- src/django/api/templates/mail/message_claimant_body.html | 4 ++-- src/django/api/templates/mail/message_claimant_body.txt | 6 +++--- .../api/templates/mail/reset_user_password_body.html | 4 ++-- .../api/templates/mail/reset_user_password_body.txt | 4 ++-- src/django/api/templates/mail/signature_block.html | 2 +- src/django/api/templates/mail/signature_block.txt | 2 +- 31 files changed, 61 insertions(+), 60 deletions(-) diff --git a/doc/release/RELEASE-NOTES.md b/doc/release/RELEASE-NOTES.md index 0de88b304..79baa82fa 100644 --- a/doc/release/RELEASE-NOTES.md +++ b/doc/release/RELEASE-NOTES.md @@ -22,6 +22,7 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html ### What's new * [OSDEV-40](https://opensupplyhub.atlassian.net/browse/OSDEV-40) - Created new page for `/contribute` to choose between multiple & single location upload. Replaced current multiple list upload to `/contribute/multiple-locations`. Changed `Upload Data` to `Add Data` text. +* [OSDEV-1524](https://opensupplyhub.atlassian.net/browse/OSDEV-1524) - Updated salutations in automated emails to ensure a consistent and professional experience of communication from OS Hub. * [OSDEV-1129](https://opensupplyhub.atlassian.net/browse/OSDEV-1129) - The UI for the results page for name and address search was implemented. It includes the following screens: * Successful Search: If the search is successful, the results screen displays a list of production locations. Each item includes the following information about the production location: name, OS ID, address, and country name. Users can either select a specific production location or press the "I don’t see my Location" button, which triggers a confirmation dialog window. * Confirmation Dialog Window: In this window, users can confirm that no correct location was found using the provided search parameters. They can either proceed to create a new production location or return to the search. diff --git a/src/django/api/templates/mail/api_limit_admin_body.html b/src/django/api/templates/mail/api_limit_admin_body.html index c8dad928d..f56d69b06 100644 --- a/src/django/api/templates/mail/api_limit_admin_body.html +++ b/src/django/api/templates/mail/api_limit_admin_body.html @@ -7,7 +7,7 @@

- Hi, + Hello,

{% if grace_limit %}

@@ -22,7 +22,7 @@

{% endif %}

- Best wishes, + Best Regards,

{% include "mail/signature_block.html" %} diff --git a/src/django/api/templates/mail/api_limit_admin_body.txt b/src/django/api/templates/mail/api_limit_admin_body.txt index 53f38c649..e31790bb8 100644 --- a/src/django/api/templates/mail/api_limit_admin_body.txt +++ b/src/django/api/templates/mail/api_limit_admin_body.txt @@ -1,5 +1,5 @@ {% block content %} -Hi, +Hello, {% if grace_limit %} You're receiving this email because {{ contributor_name }} has exceeded @@ -9,7 +9,7 @@ You're receiving this email because {{ contributor_name }} has exceeded their limit of {{ limit }} OS Hub API requests for this year. {% endif %} -Best wishes, +Best Regards, {% include "mail/signature_block.txt" %} {% endblock content %} diff --git a/src/django/api/templates/mail/api_limit_body.html b/src/django/api/templates/mail/api_limit_body.html index c9bd4586b..2e0154da2 100644 --- a/src/django/api/templates/mail/api_limit_body.html +++ b/src/django/api/templates/mail/api_limit_body.html @@ -7,11 +7,11 @@

- Hi there, + Hello,

We’re writing to notify you that you have reached your access limit for - the OS Hub API and your use of the API has now been blocked. To purchase more + the Open Supply Hub (OS Hub) API and your use of the API has now been blocked. To purchase more queries, please complete

- Best wishes, + Best Regards,

{% include "mail/signature_block.html" %} diff --git a/src/django/api/templates/mail/api_limit_body.txt b/src/django/api/templates/mail/api_limit_body.txt index dded33aed..3f42da656 100644 --- a/src/django/api/templates/mail/api_limit_body.txt +++ b/src/django/api/templates/mail/api_limit_body.txt @@ -1,13 +1,13 @@ {% block content %} -Hi there, +Hello, -We’re writing to notify you that you have reached your access limit for the -OS Hub API and your use of the API has now been blocked. To purchase more queries, +We’re writing to notify you that you have reached your access limit for the Open Supply Hub +(OS Hub) API and your use of the API has now been blocked. To purchase more queries, please complete this short form (https://docs.google.com/forms/d/e/1FAIpQLSdJax3sVHw1IeDkBs0tmfQonWaX8SiR9UYlqXUfk0rLH73Y3w/viewform) letting us know which new package you would like and a member of the OS Hub Team will be in touch to arrange payment and access. -Best wishes, +Best Regards, {% include "mail/signature_block.txt" %} {% endblock content %} diff --git a/src/django/api/templates/mail/api_limit_warning_admin_body.html b/src/django/api/templates/mail/api_limit_warning_admin_body.html index f5ae98611..0150dbfb9 100644 --- a/src/django/api/templates/mail/api_limit_warning_admin_body.html +++ b/src/django/api/templates/mail/api_limit_warning_admin_body.html @@ -7,14 +7,14 @@

- Hi, + Hello,

You're receiving this email because {{ contributor_name }} has used 90% of their limit of {{ limit }} OS Hub API requests for this year.

- Best wishes, + Best Regards,

{% include "mail/signature_block.html" %} diff --git a/src/django/api/templates/mail/api_limit_warning_admin_body.txt b/src/django/api/templates/mail/api_limit_warning_admin_body.txt index d728bbb1a..aba22daae 100644 --- a/src/django/api/templates/mail/api_limit_warning_admin_body.txt +++ b/src/django/api/templates/mail/api_limit_warning_admin_body.txt @@ -1,10 +1,10 @@ {% block content %} -Hi, +Hello, You're receiving this email because {{ contributor_name }} has used 90% of their limit of {{ limit }} OS Hub API requests for this year. -Best wishes, +Best Regards, {% include "mail/signature_block.txt" %} {% endblock content %} diff --git a/src/django/api/templates/mail/api_limit_warning_body.html b/src/django/api/templates/mail/api_limit_warning_body.html index 4d3004433..c7df20e4e 100644 --- a/src/django/api/templates/mail/api_limit_warning_body.html +++ b/src/django/api/templates/mail/api_limit_warning_body.html @@ -7,10 +7,10 @@

- Hi there, + Hello,

- We’re writing to notify you that you have used 90% of your OS Hub API + We’re writing to notify you that you have used 90% of your Open Supply Hub (OS Hub) API allowance. To increase your allowance, please complete

- Best wishes, + Best Regards,

{% include "mail/signature_block.html" %} diff --git a/src/django/api/templates/mail/api_limit_warning_body.txt b/src/django/api/templates/mail/api_limit_warning_body.txt index 69c6cba46..db43be4cd 100644 --- a/src/django/api/templates/mail/api_limit_warning_body.txt +++ b/src/django/api/templates/mail/api_limit_warning_body.txt @@ -1,13 +1,13 @@ {% block content %} -Hi there, +Hello, -We’re writing to notify you that you have used 90% of your OS Hub API allowance. +We’re writing to notify you that you have used 90% of your Open Supply Hub (OS Hub) API allowance. To increase your allowance, please complete this short form (https://docs.google.com/forms/d/e/1FAIpQLSdJax3sVHw1IeDkBs0tmfQonWaX8SiR9UYlqXUfk0rLH73Y3w/viewform) letting us know which new package you would like to purchase and a member of the OS Hub Team will be in touch to arrange payment and access. -Best wishes, +Best Regards, {% include "mail/signature_block.txt" %} {% endblock content %} diff --git a/src/django/api/templates/mail/claim_facility_approval_body.html b/src/django/api/templates/mail/claim_facility_approval_body.html index 3d6fdd4c6..165a671b7 100644 --- a/src/django/api/templates/mail/claim_facility_approval_body.html +++ b/src/django/api/templates/mail/claim_facility_approval_body.html @@ -11,7 +11,7 @@

You are receiving this email because your request to claim the following production location on - Open Supply Hub has been approved: + Open Supply Hub (OS Hub) has been approved: