Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Spelling #1245

Merged
merged 1 commit into from
Aug 4, 2024
Merged

fix: Spelling #1245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/dashboard/src/forms/fr_accounting/summary.page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ export function SummaryFormPage() {
<AlertDialogFooter>
<AlertDialogCancel>Cancel</AlertDialogCancel>
<AlertDialogAction onClick={submitRegistration}>
Complete registration
Final registration
</AlertDialogAction>
</AlertDialogFooter>
</AlertDialogContent>
Expand Down
16 changes: 8 additions & 8 deletions apps/dashboard/src/screens/dashboard/timeline_steps.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export const TIMELINE_STEPS: Partial<Record<AccessDeclaration, TimelineStep>> =
"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": {
Expand All @@ -83,11 +83,11 @@ export const TIMELINE_STEPS: Partial<Record<AccessDeclaration, TimelineStep>> =
"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
Expand All @@ -99,7 +99,7 @@ export const TIMELINE_STEPS: Partial<Record<AccessDeclaration, TimelineStep>> =
"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": {
Expand All @@ -111,7 +111,7 @@ export const TIMELINE_STEPS: Partial<Record<AccessDeclaration, TimelineStep>> =
"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:::*": {
Expand Down Expand Up @@ -157,7 +157,7 @@ export const TIMELINE_STEPS: Partial<Record<AccessDeclaration, TimelineStep>> =
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}.
</>
),
Expand All @@ -167,7 +167,7 @@ export const TIMELINE_STEPS: Partial<Record<AccessDeclaration, TimelineStep>> =
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}.
</>
),
Expand All @@ -176,7 +176,7 @@ export const TIMELINE_STEPS: Partial<Record<AccessDeclaration, TimelineStep>> =
"*:::*:::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:::*": {
Expand Down
4 changes: 2 additions & 2 deletions templates/register/email/cr_complete.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
Hello {{ signature.company_contact }}!
</p>
<p style="font-size:16px;line-height:24px;margin:16px 0;color:#525f7f;text-align:left">
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 }}.
</p>
<p style="font-size:16px;line-height:24px;margin:16px 0;color:#525f7f;text-align:left">
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.
</p>
{% include 'email/button.html' with content="Go to dashboard" url="https://ais.armada.nu/register" %}
Expand Down
Loading