scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(SW-360): review feedback

Browse Source
This commit is contained in:
Chuma McPhoy
2024-11-21 15:10:28 +01:00
parent 0865a553cd
commit 6f980fe9cd
8 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
components/Forms/Signup/index.tsx
View File

@@ -37,7 +37,6 @@ export default function SignupForm({ link, subtitle, title }: SignUpFormProps) {
const email = intl.formatMessage({ id: "Email address" }) const email = intl.formatMessage({ id: "Email address" })
const phoneNumber = intl.formatMessage({ id: "Phone number" }) const phoneNumber = intl.formatMessage({ id: "Phone number" })
const zipCode = intl.formatMessage({ id: "Zip code" }) const zipCode = intl.formatMessage({ id: "Zip code" })
const acceptTermsText = intl.formatMessage({ id: "signupPage.terms" })
const signupButtonText = intl.formatMessage({ const signupButtonText = intl.formatMessage({
id: "Sign up to Scandic Friends", id: "Sign up to Scandic Friends",
}) })
@@ -159,15 +158,21 @@ export default function SignupForm({ link, subtitle, title }: SignUpFormProps) {
</header> </header>
<Checkbox name="termsAccepted" registerOptions={{ required: true }}> <Checkbox name="termsAccepted" registerOptions={{ required: true }}>
<Body> <Body>
{acceptTermsText}{" "} {intl.formatMessage<React.ReactNode>(
<Link { id: "signupPage.terms" },
variant="underscored" {
color="peach80" termsLink: (str) => (
target="_blank" <Link
href={privacyPolicy[lang]} variant="underscored"
> color="peach80"
{intl.formatMessage({ id: "Scandic's Privacy Policy." })} target="_blank"
</Link> href={privacyPolicy[lang]}
>
{str}
</Link>
),
}
)}
</Body> </Body>
</Checkbox> </Checkbox>
</section> </section>

2
i18n/dictionaries/da.json
View File

@@ -465,7 +465,7 @@
"points": "Point", "points": "Point",
"room type": "værelsestype", "room type": "værelsestype",
"room types": "værelsestyper", "room types": "værelsestyper",
"signupPage.terms": "Ja, jeg accepterer vilkårene og betingelserne for Scandic Friends og forstår, at Scandic vil behandle mine personlige data i overensstemmelse med", "signupPage.terms": "Ja, jeg accepterer vilkårene og betingelserne for Scandic Friends og forstår, at Scandic vil behandle mine personlige data i overensstemmelse med <termsLink>Scandic's integritetspolicy.</termsLink>",
"special character": "speciel karakter", "special character": "speciel karakter",
"spendable points expiring by": "{points} Brugbare point udløber den {date}", "spendable points expiring by": "{points} Brugbare point udløber den {date}",
"to": "til", "to": "til",

2
i18n/dictionaries/de.json
View File

@@ -464,7 +464,7 @@
"points": "Punkte", "points": "Punkte",
"room type": "zimmerart", "room type": "zimmerart",
"room types": "zimmerarten", "room types": "zimmerarten",
"signupPage.terms": "Ja, ich akzeptiere die Allgemeinen Geschäftsbedingungen für Scandic Friends und verstehe, dass Scandic meine persönlichen Daten gemäß", "signupPage.terms": "Ja, ich akzeptiere die Allgemeinen Geschäftsbedingungen für Scandic Friends und verstehe, dass Scandic meine persönlichen Daten gemäß <termsLink>Scandics Datenschutzrichtlinie.</termsLink>",
"special character": "sonderzeichen", "special character": "sonderzeichen",
"spendable points expiring by": "{points} Einlösbare punkte verfallen bis zum {date}", "spendable points expiring by": "{points} Einlösbare punkte verfallen bis zum {date}",
"to": "zu", "to": "zu",

2
i18n/dictionaries/en.json
View File

@@ -504,7 +504,7 @@
"room type": "room type", "room type": "room type",
"room types": "room types", "room types": "room types",
"signup.terms": "By signing up you accept the Scandic Friends <termsLink>Terms and Conditions</termsLink>. Your membership is valid until further notice, and you can terminate your membership at any time by sending an email to Scandic’s customer service", "signup.terms": "By signing up you accept the Scandic Friends <termsLink>Terms and Conditions</termsLink>. Your membership is valid until further notice, and you can terminate your membership at any time by sending an email to Scandic’s customer service",
"signupPage.terms": "Yes, I accept the Terms and conditions for Scandic Friends and understand that Scandic will process my personal data in accordance with", "signupPage.terms": "Yes, I accept the Terms and conditions for Scandic Friends and understand that Scandic will process my personal data in accordance with <termsLink>Scandic's Privacy Policy.</termsLink>",
"special character": "special character", "special character": "special character",
"spendable points expiring by": "{points} spendable points expiring by {date}", "spendable points expiring by": "{points} spendable points expiring by {date}",
"to": "to", "to": "to",

1
i18n/dictionaries/fi.json
View File

@@ -463,6 +463,7 @@
"points": "pistettä", "points": "pistettä",
"room type": "huonetyyppi", "room type": "huonetyyppi",
"room types": "huonetyypit", "room types": "huonetyypit",
"signupPage.terms": "Kyllä, hyväksyn Scandic Friends -käyttöehdot ja ymmärrän, että Scandic käsittelee henkilötietojani <termsLink>Scandicin tietosuojakäytännön</termsLink> mukaisesti.",
"special character": "erikoishahmo", "special character": "erikoishahmo",
"spendable points expiring by": "{points} pistettä vanhenee {date} mennessä", "spendable points expiring by": "{points} pistettä vanhenee {date} mennessä",
"to": "to", "to": "to",

2
i18n/dictionaries/no.json
View File

@@ -461,7 +461,7 @@
"points": "poeng", "points": "poeng",
"room type": "romtype", "room type": "romtype",
"room types": "romtyper", "room types": "romtyper",
"signupPage.terms": "Ja, jeg godtar vilkårene og betingelsene for Scandic Friends og forstår at Scandic vil behandle mine personopplysninger i henhold til", "signupPage.terms": "Ja, jeg godtar vilkårene og betingelsene for Scandic Friends og forstår at Scandic vil behandle mine personopplysninger i henhold til <termsLink>Scandics integritetspolicy.</termsLink>",
"special character": "spesiell karakter", "special character": "spesiell karakter",
"spendable points expiring by": "{points} Brukbare poeng utløper innen {date}", "spendable points expiring by": "{points} Brukbare poeng utløper innen {date}",
"to": "til", "to": "til",

2
i18n/dictionaries/sv.json
View File

@@ -462,7 +462,7 @@
"points": "poäng", "points": "poäng",
"room type": "rumtyp", "room type": "rumtyp",
"room types": "rumstyper", "room types": "rumstyper",
"signupPage.terms": "Ja, jag accepterar villkoren för Scandic Friends och förstår att Scandic kommer att behandla mina personuppgifter i enlighet med", "signupPage.terms": "Ja, jag accepterar villkoren för Scandic Friends och förstår att Scandic kommer att behandla mina personuppgifter i enlighet med <termsLink>Scandics integritetspolicy.</termsLink>",
"special character": "speciell karaktär", "special character": "speciell karaktär",
"spendable points expiring by": "{points} poäng förfaller {date}", "spendable points expiring by": "{points} poäng förfaller {date}",
"to": "till", "to": "till",

2
server/routers/user/output.ts
View File

@@ -1,8 +1,6 @@
import { z } from "zod" import { z } from "zod"
import { countriesMap } from "@/components/TempDesignSystem/Form/Country/countries" import { countriesMap } from "@/components/TempDesignSystem/Form/Country/countries"
import { passwordValidator } from "@/utils/passwordValidator"
import { phoneValidator } from "@/utils/phoneValidator"
import { getMembership } from "@/utils/user" import { getMembership } from "@/utils/user"
export const membershipSchema = z.object({ export const membershipSchema = z.object({