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.

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

🏷️ Update text snippets and fix pension form translation issue #… #2686

Merged
merged 3 commits into from
Nov 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 5 additions & 15 deletions sanityv3/schemas/textSnippets.ts
Original file line number Diff line number Diff line change
Expand Up @@ -163,11 +163,6 @@ const snippets: textSnippet = {
defaultValue: 'Please choose one or more of the following',
group: groups.subscribeForm,
},
subscribe_form_email: {
title: 'Email',
defaultValue: 'Email',
group: groups.subscribeForm,
},
subscribe_form_general_news: {
title: 'General News',
defaultValue: 'General News',
Expand Down Expand Up @@ -241,11 +236,6 @@ const snippets: textSnippet = {
'Want the full picture? We’d love to share this content with you, but first you must accept {type1}, {type2} and {type3} cookies by enabling them in our cookie settings.',
group: groups.cookie,
},
contact_form_email: {
title: 'Email',
defaultValue: 'Email *',
group: groups.contactForm,
},
contact_form_category: {
title: 'Category',
defaultValue: 'Category',
Expand Down Expand Up @@ -305,6 +295,11 @@ const snippets: textSnippet = {
title: 'Pension Category',
defaultValue: 'Pension',
group: groups.pensionForm,
},
pension_form_select_topic: {
title: 'Default Pension Category',
defaultValue: 'Pension',
group: groups.pensionForm,
},
pension_form_category_travel_insurance: {
title: 'Travel Insurance Category',
Expand Down Expand Up @@ -367,11 +362,6 @@ const snippets: textSnippet = {
defaultValue: 'Please enter your phone number',
group: groups.careerFairForm,
},
career_fair_form_email: {
title: 'Email',
defaultValue: 'Email',
group: groups.careerFairForm,
},
career_fair_form_event: {
title: 'Event',
defaultValue: 'Event',
Expand Down
6 changes: 3 additions & 3 deletions web/pageComponents/topicPages/Form/CareerFairForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -207,10 +207,10 @@ const CareerFairForm = () => {
<FormTextField
{...props}
id={props.name}
label={intl.formatMessage({
id: 'career_fair_form_email',
label={`${intl.formatMessage({
id: 'email',
defaultMessage: 'Email',
})}
})}*`}
inputRef={ref}
inputIcon={invalid ? <Icon data={error_filled} title="error" /> : undefined}
helperText={error?.message}
Expand Down
10 changes: 5 additions & 5 deletions web/pageComponents/topicPages/Form/PensionForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ const PensionForm = () => {
pattern: {
value: /^[\w!#$%&'*+/=?`{|}~^-]+(?:\.[\w!#$%&'*+/=?`{|}~^-]+)*@(?:[a-zA-Z0-9-]+\.)+[a-zA-Z]{2,6}$/g,
message: intl.formatMessage({
id: 'pension_form_email_validation',
id: 'email_validation',
defaultMessage: 'Please fill out a valid email address',
}),
},
Expand Down Expand Up @@ -188,14 +188,14 @@ const PensionForm = () => {
{intl.formatMessage({ id: 'pension_form_select_topic', defaultMessage: 'Select topic' })}
</option>
<option value="pension">
{intl.formatMessage({ id: 'pension_form_pension', defaultMessage: 'Pension' })}
{intl.formatMessage({ id: 'pension_form_category_pension', defaultMessage: 'Pension' })}
</option>
<option value="travelInsurance">
{intl.formatMessage({ id: 'pension_form_travel_insurance', defaultMessage: 'Travel Insurance' })}
{intl.formatMessage({ id: 'pension_form_category_travel_insurance', defaultMessage: 'Travel Insurance' })}
</option>
<option value="otherPensionInsuranceRelated">
{intl.formatMessage({
id: 'pension_form_other_pension_insurance_related',
id: 'pension_form_category_other',
defaultMessage: 'Other Pension/Insurance Related',
})}
</option>
Expand Down Expand Up @@ -262,7 +262,7 @@ const PensionForm = () => {
{isSubmitting ? (
<FormattedMessage id="form_sending" defaultMessage={'Sending...'}></FormattedMessage>
) : (
<FormattedMessage id="pension_form_cta" defaultMessage="Submit Form" />
<FormattedMessage id="pension_form_submit" defaultMessage="Submit Form" />
)}
</Button>
</>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -184,10 +184,10 @@ const CareersContactForm = () => {
<FormTextField
{...props}
id={props.name}
label={intl.formatMessage({
id: 'careers_contact_form_email',
label={`${intl.formatMessage({
id: 'email',
defaultMessage: 'Email',
})}
})}*`}
inputRef={ref}
inputIcon={invalid ? <Icon data={error_filled} title="error" /> : undefined}
helperText={error?.message}
Expand Down
Loading