Skip to content

Commit

Permalink
[OSDEV-1524] align salutations and signatures in automated emails (#478)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
FrancescaOSH authored Jan 7, 2025
1 parent 47a74ec commit 1155fa2
Show file tree
Hide file tree
Showing 31 changed files with 61 additions and 60 deletions.
1 change: 1 addition & 0 deletions doc/release/RELEASE-NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions src/django/api/templates/mail/api_limit_admin_body.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</head>
<body>
<p>
Hi,
Hello,
</p>
{% if grace_limit %}
<p>
Expand All @@ -22,7 +22,7 @@
</p>
{% endif %}
<p>
Best wishes,
Best Regards,
</p>
{% include "mail/signature_block.html" %}
</body>
Expand Down
4 changes: 2 additions & 2 deletions src/django/api/templates/mail/api_limit_admin_body.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% block content %}
Hi,
Hello,

{% if grace_limit %}
You're receiving this email because {{ contributor_name }} has exceeded
Expand All @@ -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 %}
6 changes: 3 additions & 3 deletions src/django/api/templates/mail/api_limit_body.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
</head>
<body>
<p>
Hi there,
Hello,
</p>
<p>
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
<a
href="https://docs.google.com/forms/d/e/1FAIpQLSdJax3sVHw1IeDkBs0tmfQonWaX8SiR9UYlqXUfk0rLH73Y3w/viewform"
Expand All @@ -21,7 +21,7 @@
Team will be in touch to arrange payment and access.
</p>
<p>
Best wishes,
Best Regards,
</p>
{% include "mail/signature_block.html" %}
</body>
Expand Down
8 changes: 4 additions & 4 deletions src/django/api/templates/mail/api_limit_body.txt
Original file line number Diff line number Diff line change
@@ -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 %}
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
</head>
<body>
<p>
Hi,
Hello,
</p>
<p>
You're receiving this email because {{ contributor_name }} has used
90% of their limit of {{ limit }} OS Hub API requests for this year.
</p>
<p>
Best wishes,
Best Regards,
</p>
{% include "mail/signature_block.html" %}
</body>
Expand Down
Original file line number Diff line number Diff line change
@@ -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 %}
6 changes: 3 additions & 3 deletions src/django/api/templates/mail/api_limit_warning_body.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
</head>
<body>
<p>
Hi there,
Hello,
</p>
<p>
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
<a
href="https://docs.google.com/forms/d/e/1FAIpQLSdJax3sVHw1IeDkBs0tmfQonWaX8SiR9UYlqXUfk0rLH73Y3w/viewform"
Expand All @@ -20,7 +20,7 @@
of the OS Hub Team will be in touch to arrange payment and access.
</p>
<p>
Best wishes,
Best Regards,
</p>
{% include "mail/signature_block.html" %}
</body>
Expand Down
6 changes: 3 additions & 3 deletions src/django/api/templates/mail/api_limit_warning_body.txt
Original file line number Diff line number Diff line change
@@ -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 %}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</p>
<p>
You are receiving this email because your <a href="https://info.opensupplyhub.org/resources/claim-a-facility">request to claim</a> the following production location on
Open Supply Hub has been approved:
Open Supply Hub (OS Hub) has been approved:
</p>
<ul>
<li>
Expand All @@ -35,7 +35,7 @@
information to a claimed production location’s profile.
</p>
<p>
Best wishes,
Best Regards,
</p>
{% include "mail/claims_team_signature_block.html" %}
</body>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Hello,

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:

- Name of Production Location: {{ production_location_name }}
- Address of Production Location: {{ production_location_address }}, {{ production_location_country }}
Expand All @@ -16,7 +16,7 @@ your data to OS Hub. Once approved, those locations can be claimed as well.
Visit https://opensupplyhub.org/claimed to view your approved claims and add additional
information to a claimed production location’s profile.

Best wishes,
Best Regards,

{% include "mail/claims_team_signature_block.txt" %}
{% endblock content %}
4 changes: 2 additions & 2 deletions src/django/api/templates/mail/claim_facility_denial_body.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</p>
<p>
You are receiving this email because your <a href="https://info.opensupplyhub.org/resources/claim-a-facility">request to claim</a> the following production location on
Open Supply Hub has been denied:
Open Supply Hub (OS Hub) has been denied:
</p>
<ul>
<li>
Expand All @@ -38,7 +38,7 @@
steps. Remember to provide the additional supporting evidence requested in your previous claim.
</p>
<p>
Best wishes,
Best Regards,
</p>
{% include "mail/claims_team_signature_block.html" %}
</body>
Expand Down
4 changes: 2 additions & 2 deletions src/django/api/templates/mail/claim_facility_denial_body.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Hello,

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

- Name of Production Location: {{ production_location_name }}
- Address of Production Location: {{ production_location_address }}, {{ production_location_country }}
Expand All @@ -18,7 +18,7 @@ If you wish to resubmit your claim and try again, please go to the profile you
the "I want to claim this production location" link at the top of the screen, and follow the next
steps. Remember to provide the additional supporting evidence requested in your previous claim.

Best wishes,
Best Regards,

{% include "mail/claims_team_signature_block.txt" %}
{% endblock content %}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</p>
<p>
You are receiving this email because your <a href="https://info.opensupplyhub.org/resources/claim-a-facility">request to claim</a> the following production location on
Open Supply Hub has been revoked:
Open Supply Hub (OS Hub) has been revoked:
</p>
<ul>
<li>
Expand Down Expand Up @@ -40,7 +40,7 @@
Remember to provide supporting evidence to address the reason that your claim was revoked.
</p>
<p>
Best wishes,
Best Regards,
</p>
{% include "mail/claims_team_signature_block.html" %}
</body>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Hello,

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

- Name of Production Location: {{ production_location_name }}
- Address of Production Location: {{ production_location_address }}, {{ production_location_country }}
Expand All @@ -19,7 +19,7 @@ with correct and updated information. To do so, go to the profile you would like
"I want to claim this production location" link at the top of the screen, and follow the next steps.
Remember to provide supporting evidence to address the reason that your claim was revoked.

Best wishes,
Best Regards,

{% include "mail/claims_team_signature_block.txt" %}
{% endblock content %}
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<p>Hello,</p>
<p>
You are receiving this email because you submitted a request to
claim the following production location on Open Supply Hub:
claim the following production location on Open Supply Hub (OS Hub):
</p>
<ul>
<li>Name of Production Location: {{ facility_name }}</li>
Expand All @@ -28,7 +28,7 @@
expected processing time for the initial review of a claim is 10-14
days.
</p>
<p>Best wishes,</p>
<p>Best Regards,</p>
{% include "mail/claims_team_signature_block.html" %}
</body>
</html>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% block content %}
Hello,

You are receiving this email because you submitted a request to claim the following production location on Open Supply Hub:
You are receiving this email because you submitted a request to claim the following production location on Open Supply Hub (OS Hub):

- Name of Production Location: {{ facility_name }}
- Address of Production Location: {{ facility_address }}
Expand All @@ -11,7 +11,7 @@ Please note: Buyers can refer their suppliers to claim their profiles on OS Hub;

The OS Hub Team will review your request and be in touch soon. The expected processing time for the initial review of a claim is 10-14 days.

Best wishes,
Best Regards,

{% include "mail/claims_team_signature_block.txt" %}
{% endblock content %}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<p>OS Hub Claims Team</p>
<p>The OS Hub Claims Team</p>
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{% block content %}
OS Hub Claims Team
The OS Hub Claims Team
{% endblock content %}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<p>
OS Hub Data Team
The OS Hub Data Team
</p>
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{% block content %}
OS Hub Data Team
The OS Hub Data Team
{% endblock content %}
4 changes: 2 additions & 2 deletions src/django/api/templates/mail/email_confirmation_message.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</head>
<body>
<p>
Hi,
Hello,
</p>
<p>
You're receiving this message because you registered for an Open Supply
Expand All @@ -17,7 +17,7 @@
To activate your account, visit <a href="{{ activate_url }}">{{ activate_url }}</a>
</p>
<p>
Sincerely,
Best Regards,
</p>
{% include "mail/signature_block.html" %}
</body>
Expand Down
4 changes: 2 additions & 2 deletions src/django/api/templates/mail/email_confirmation_message.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{% block content %}
Hi,
Hello,

You're receiving this message because you registered for an Open Supply Hub Account.

To activate your account, visit {{ activate_url }}

Sincerely,
Best Regards,

{% include "mail/signature_block.txt" %}
{% endblock content %}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</head>
<body>
<p>
Hi,
Hello,
</p>
<p>
You're receiving this email because a facility on one of your
Expand All @@ -34,7 +34,7 @@
</ul>
{% endif %}
<p>
Best wishes,
Best Regards,
</p>
{% include "mail/data_team_signature_block.html" %}
</body>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% block content %}
Hi,
Hello,

You're receiving this email because a facility on one of your facility lists
has had its facility claim data updated.
Expand All @@ -16,6 +16,6 @@ The following details have been changed:
- {{ change }} {% endfor %}
{% endif %}

Best wishes,
Best Regards,
{% include "mail/data_team_signature_block.txt" %}
{% endblock content %}
4 changes: 2 additions & 2 deletions src/django/api/templates/mail/message_claimant_body.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<title>Your Facility claim request on OS Hub - Action Required</title>
</head>
<body>
<p>Hi,</p>
<p>Hello,</p>
<p>
You're receiving this email because you were listed as the contact
for a facility claim request on Open Supply Hub.
Expand Down Expand Up @@ -37,7 +37,7 @@
we can process this straight away. We'll review the materials and
get in touch if we need any additional information.
</p>
<p>Best wishes,</p>
<p>Best Regards,</p>
{% include "mail/claims_team_signature_block.html" %}
</body>
</html>
Loading

0 comments on commit 1155fa2

Please sign in to comment.