diff --git a/apps/dashboard/src/forms/fr_accounting/summary.page.tsx b/apps/dashboard/src/forms/fr_accounting/summary.page.tsx index e40b580f..6ae61873 100644 --- a/apps/dashboard/src/forms/fr_accounting/summary.page.tsx +++ b/apps/dashboard/src/forms/fr_accounting/summary.page.tsx @@ -189,7 +189,7 @@ export function SummaryFormPage() { Cancel - Complete registration + Final registration diff --git a/apps/dashboard/src/screens/dashboard/timeline_steps.tsx b/apps/dashboard/src/screens/dashboard/timeline_steps.tsx index fe585890..82f0e46a 100644 --- a/apps/dashboard/src/screens/dashboard/timeline_steps.tsx +++ b/apps/dashboard/src/screens/dashboard/timeline_steps.tsx @@ -71,7 +71,7 @@ export const TIMELINE_STEPS: Partial> = "complete_registration:::signed_cr:::pending": { title: "You have completed the final registration!", description: - "We are currently processing your application. In the meanwhile, please make sure to fill in the remaining cards.", + "We are currently processing your application. Meanwhile, please make sure to fill in the remaining cards.", variant: "success" }, "complete_registration:::signed_cr:::accepted": { @@ -83,11 +83,11 @@ export const TIMELINE_STEPS: Partial> = "complete_registration:::signed_cr:::waitlist": { title: "You have completed the final registration!", description: - "You have been placed on the waitlist. In the meanwhile, please make sure to fill in the remaining cards.", + "You have been placed on the waitlist. Meanwhile, please make sure to fill in the remaining cards.", variant: "success" }, "after_complete_registration:::!signed_cr:::*": { - title: "The complete registration is over", + title: "The final registration is over", description: ( <> Please contact us at {salesEmail} if you want to participate @@ -99,7 +99,7 @@ export const TIMELINE_STEPS: Partial> = "after_complete_registration:::signed_cr:::pending": { title: "You have completed the final registration!", description: - "We are currently processing your application. In the meanwhile, please make sure to fill in the remaining cards.", + "We are currently processing your application. Meanwhile, please make sure to fill in the remaining cards.", variant: "success" }, "after_complete_registration:::signed_cr:::accepted": { @@ -111,7 +111,7 @@ export const TIMELINE_STEPS: Partial> = "after_complete_registration:::signed_cr:::waitlist": { title: "You have completed the final registration!", description: - "You have been placed on the waitlist. In the meanwhile, please make sure to fill in the remaining cards.", + "You have been placed on the waitlist. Meanwhile, please make sure to fill in the remaining cards.", variant: "success" }, "fair:::!signed_cr:::*": { @@ -157,7 +157,7 @@ export const TIMELINE_STEPS: Partial> = title: "We are currently processing your application", description: ( <> - In the meanwhile, please fill out the available cards. If + Meanwhile, please fill out the available cards. If you have any questions please contact us at {salesEmail}. ), @@ -167,7 +167,7 @@ export const TIMELINE_STEPS: Partial> = title: "You have been placed on the waitlist", description: ( <> - In the meanwhile, please fill out the available cards. If + Meanwhile, please fill out the available cards. If you have any questions please contact us at {salesEmail}. ), @@ -176,7 +176,7 @@ export const TIMELINE_STEPS: Partial> = "*:::*:::accepted": { title: "Congratulations! You've got a spot at the fair", description: - "We'll be in touch with more information, in the mean time, please fill out the available forms", + "We'll be in touch with more information. Meanwhile, please fill out the available forms", variant: "success" }, "*:::!signed_ir:::*": { diff --git a/templates/register/email/cr_complete.html b/templates/register/email/cr_complete.html index 4a02e179..2a103327 100644 --- a/templates/register/email/cr_complete.html +++ b/templates/register/email/cr_complete.html @@ -5,11 +5,11 @@ Hello {{ signature.company_contact }}!

- Thank you for submitting the final registration for THS Armada {{ fair.year }}. The complete registration contract was + Thank you for submitting the final registration for THS Armada {{ fair.year }}. The final registration contract was signed by {{ signature.company_contact }} on the {{ signature.timestamp|date:"Y-m-d (H:i)" }} for {{ signature.company }}.

- The complete registration is binding and you will be liable for all additional services selected at the last date of the registration + The final registration is binding and you will be liable for all additional services selected at the last date of the registration ({{ deadline|date:"Y-m-d" }}), provided that THS Armada is able to supply your organization with your choices. To view your order, please visit the dashboard.

{% include 'email/button.html' with content="Go to dashboard" url="https://ais.armada.nu/register" %}