Skip to content

Commit

Permalink
Merge pull request #3081 from bitzesty/staging
Browse files Browse the repository at this point in the history
Production < staging
  • Loading branch information
TheDancingClown authored Sep 9, 2024
2 parents b60aeef + 6dbed0d commit 085a941
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion app/mailers/account_mailers/reminder_to_submit_mailer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ def notify(form_answer_id, collaborator_id)
submission_deadline = Settings.current_submission_deadline
deadline_time = formatted_deadline_time(submission_deadline)
deadline_date = submission_deadline.trigger_at.strftime("%A, %d %B %Y")
@deadline = "#{deadline_time} on #{deadline_date}"
@deadline = "#{deadline_time} this #{deadline_date}"

ordinal = submission_deadline.trigger_at.day.ordinal
subject_deadline = submission_deadline.strftime("%e#{ordinal} %B")
Expand Down
2 changes: 1 addition & 1 deletion app/renderers/mail_renderer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ def reminder_to_submit
assigns[:user] = dummy_user("Jon", "Doe", "Jane's Company")
assigns[:form_answer] = form_answer
deadline_time = deadline_time("submission_end")
assigns[:deadline] = deadline_str("submission_end", "#{deadline_time} on %A, %d %B %Y")
assigns[:deadline] = deadline_str("submission_end", "#{deadline_time} this %A, %d %B %Y")

render(assigns, "account_mailers/reminder_to_submit_mailer/preview/notify")
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ We're really happy to hear that you've started your application, so please don't

#<%= @deadline %>

Whether you excel in international trade, have a great innovative product or service, or have an impressive social mobility initiative or sustainable development programme, receiving a King's Award is a unique way to gain recognition for your achievements.

If you miss the deadline, you will lose the chance for your business to receive this internationally-respected accolade. So act now!
Receiving a King's Award is a unique way to gain recognition for your business's achievements, so if you miss the deadline, you will lose the chance for your business to receive this internationally respected accolade.

If you have any queries, please contact us at [email protected] or via the Helpline on 020 7 215 6880.

Visit the King's Awards for Enterprise website to continue and submit your application via the link below:
<%= edit_form_url(id: @form_answer.id) %>

If you have already submitted your application - for example, for another category, or you have decided not to submit your application - please ignore this message, and thank you for your interest in The King's Awards.
If you have already submitted your application - for example, for another category, or you have decided not to submit your application - please ignore this reminder, and thank you for your interest in The King's Awards.

We want to improve our service, so it would be very helpful to have your feedback on the application process. Please look out for our user survey in around two weeks' time.

Thank you,

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@ p style="font-size: 19px; line-height: 1.315789474; margin: 30px 0 30px 0; font-
=< @deadline

p style="font-size: 19px; line-height: 1.315789474; margin: 30px 0 30px 0;"
| Whether you excel in international trade, have a great innovative product or service, or have an impressive social mobility initiative or sustainable development programme, receiving a King's Award is a unique way to gain recognition for your achievements.

p style="font-size: 19px; line-height: 1.315789474; margin: 30px 0 30px 0;"
| If you miss the deadline, you will lose your chance for your business to receive this internationally-respected accolade. So act now!
| Receiving a King's Award is a unique way to gain recognition for your business's achievements, so if you miss the deadline, you will lose the chance for your business to receive this internationally respected accolade.

p style="font-size: 19px; line-height: 1.315789474; margin: 30px 0 30px 0;"
| If you have any queries, please contact us at [email protected] or via the Helpline on 020 7 215 6880.
Expand All @@ -22,7 +19,10 @@ p style="font-size: 19px; line-height: 1.315789474; margin: 30px 0 30px 0;"
= link_to edit_form_url(id: @form_answer.id), edit_form_url(id: @form_answer.id)

p style="font-size: 19px; line-height: 1.315789474; margin: 30px 0 30px 0;"
| If you have already submitted your application - for example, for another category, or you have decided not to submit your application - please ignore this message, and thank you for your interest in The King's Awards.
| If you have already submitted your application - for example, for another category, or you have decided not to submit your application - please ignore this reminder, and thank you for your interest in The King's Awards.

p style="font-size: 19px; line-height: 1.315789474; margin: 30px 0 30px 0;"
| We want to improve our service, so it would be very helpful to have your feedback on the application process. Please look out for our user survey in around two weeks' time.

p style="font-size: 19px; line-height: 1.315789474; margin: 30px 0 30px 0;"
| Thank you,
Expand Down

0 comments on commit 085a941

Please sign in to comment.